tony2001 Fri Feb 25 06:31:12 2005 EDT
Modified files:
/php-src/ext/oci8 config.m4
Log:
fix bug preventing from building oci8 as shared module
(patch by stanislav dot voroniy at portavita dot nl)
http://cvs.php.net/diff.php/php-src/ext/oci8/config.m4?r1=1.53&r2=1.54&ty=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.53 php-src/ext/oci8/config.m4:1.54
--- php-src/ext/oci8/config.m4:1.53 Thu Dec 30 02:08:37 2004
+++ php-src/ext/oci8/config.m4 Fri Feb 25 06:31:10 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.53 2004/12/30 07:08:37 sniper Exp $
+dnl $Id: config.m4,v 1.54 2005/02/25 11:31:10 tony2001 Exp $
dnl
AC_DEFUN([PHP_OCI_IF_DEFINED],[
@@ -80,13 +80,17 @@
[ --with-oci8[=DIR] Include Oracle (OCI8) support using an ORACLE_HOME
install. The default DIR is ORACLE_HOME])
-PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle
Instant Client,
-[ --with-oci8-instant-client[=DIR]
+if test "$PHP_OCI8" = "no"; then
+ PHP_ARG_WITH(oci8-instant-client, for Oracle (OCI8) support using Oracle
Instant Client,
+ [ --with-oci8-instant-client[=DIR]
Include Oracle (OCI8) support using
Oracle Instant Client. DIR is the directory with the
Instant Client libraries. On Linux it will default to
/usr/lib/oracle/<most_recent_version>/client/lib
Other platforms will need to have it explicitly
specified.])
+else
+ PHP_OCI8_INSTANT_CLIENT="no";
+fi
if test "$PHP_OCI8" != "no"; then
if test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
