From 40e44e99d6ebf7ba93a508fb60cc1af9c9a50d4e Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 13 Jul 2007 09:24:30 +0000 Subject: MFH: don't allow $PHP_OCI8 to be empty if OCI8 is enabled fixes bug #41988 --- ext/oci8/config.m4 | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ext/oci8/config.m4') 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 -- cgit v1.2.1