diff options
author | Antony Dovgal <tony2001@php.net> | 2007-07-13 09:24:30 +0000 |
---|---|---|
committer | Antony Dovgal <tony2001@php.net> | 2007-07-13 09:24:30 +0000 |
commit | 40e44e99d6ebf7ba93a508fb60cc1af9c9a50d4e (patch) | |
tree | 2c2388f3a51427bd154d124716418bb815aaa0e5 /ext/oci8/config.m4 | |
parent | 1e768865dce01e401e479f415900e782892cd23d (diff) | |
download | php-git-40e44e99d6ebf7ba93a508fb60cc1af9c9a50d4e.tar.gz |
MFH: don't allow $PHP_OCI8 to be empty if OCI8 is enabled
fixes bug #41988
Diffstat (limited to 'ext/oci8/config.m4')
-rw-r--r-- | ext/oci8/config.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
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 |