tony2001 Fri Jul 13 09:24:30 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 config.m4
Log:
MFH: don't allow $PHP_OCI8 to be empty if OCI8 is enabled
fixes bug #41988
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/config.m4?r1=1.55.2.3.2.8&r2=1.55.2.3.2.9&diff_format=u
Index: php-src/ext/oci8/config.m4
diff -u php-src/ext/oci8/config.m4:1.55.2.3.2.8
php-src/ext/oci8/config.m4:1.55.2.3.2.9
--- php-src/ext/oci8/config.m4:1.55.2.3.2.8 Wed Jul 11 22:16:11 2007
+++ php-src/ext/oci8/config.m4 Fri Jul 13 09:24:30 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.55.2.3.2.8 2007/07/11 22:16:11 tony2001 Exp $
+dnl $Id: config.m4,v 1.55.2.3.2.9 2007/07/13 09:24:30 tony2001 Exp $
dnl
if test -z "$SED"; then
@@ -138,12 +138,18 @@
if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
PHP_OCI8_INSTANT_CLIENT="yes"
fi
+ if test -z "$PHP_OCI8"; then
+ PHP_OCI8=yes
+ fi
elif test "`echo $PHP_OCI8 | cut -d, -f1`" = "instantclient"; then
PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`"
PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f3,4`"
if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then
PHP_OCI8_INSTANT_CLIENT="yes"
fi
+ if test -z "$PHP_OCI8"; then
+ PHP_OCI8=yes
+ fi
fi
if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
