From: Antony Dovgal Date: Fri, 13 Jul 2007 09:23:46 +0000 (+0000) Subject: don't allow $PHP_OCI8 to be empty when OCI8 is enabled X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~137 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=879cd8b7be34c58883831da639ad7033ad1101e6;p=php don't allow $PHP_OCI8 to be empty when OCI8 is enabled --- diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index 4c6a515c6a..e0e1adba00 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -138,12 +138,18 @@ if test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then 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