diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-07-11 22:16:11 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-07-11 22:16:11 +0000 |
| commit | 4ef905ae59202730d1d8a37d4babec76f98b6664 (patch) | |
| tree | 4b2dd73d8673734d28c8a0610922d671dd5b5e31 | |
| parent | d3ac98438591d27ad83828b73fa7cd295660a7b7 (diff) | |
| download | php-git-4ef905ae59202730d1d8a37d4babec76f98b6664.tar.gz | |
MFH
| -rw-r--r-- | ext/oci8/config.m4 | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index f858c4cf78..4c6a515c6a 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -37,9 +37,9 @@ AC_DEFUN([AC_OCI8_CHECK_LIB_DIR],[ AC_MSG_CHECKING([OCI8 libraries dir]) if test -d "$OCI8_DIR/lib" -a ! -d "$OCI8_DIR/lib32"; then - OCI8_LIB_DIR=lib + OCI8_LIB_DIR=lib elif ! test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then - OCI8_LIB_DIR=lib32 + OCI8_LIB_DIR=lib32 elif test -d "$OCI8_DIR/lib" -a -d "$OCI8_DIR/lib32"; then OCI8_LIB_DIR=$TMP_OCI8_LIB_DIR else @@ -100,6 +100,7 @@ PHP_ARG_WITH(oci8, for Oracle (OCI8) support, Use --with-oci8=instantclient,/path/to/oic/lib for an Oracle Instant Client installation]) +if test "$PHP_OCI8" != "no"; then AC_MSG_CHECKING([PHP version]) tmp_version=$PHP_VERSION @@ -127,22 +128,22 @@ PHP_ARG_WITH(oci8, for Oracle (OCI8) support, else AC_MSG_RESULT([$php_version, ok]) fi - +fi PHP_OCI8_INSTANT_CLIENT="no" if test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then - PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`" + PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f3`" PHP_OCI8="`echo $PHP_OCI8 | cut -d, -f1,4`" - if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then - PHP_OCI8_INSTANT_CLIENT="yes" - fi + if test "$PHP_OCI8_INSTANT_CLIENT" = ""; then + PHP_OCI8_INSTANT_CLIENT="yes" + fi elif test "`echo $PHP_OCI8 | cut -d, -f1`" = "instantclient"; then - PHP_OCI8_INSTANT_CLIENT="`echo $PHP_OCI8 | cut -d, -f2`" + 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 "$PHP_OCI8_INSTANT_CLIENT" = ""; then + PHP_OCI8_INSTANT_CLIENT="yes" + fi fi if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then @@ -215,7 +216,7 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then -L$OCI8_DIR/$OCI8_LIB_DIR $OCI8_SHARED_LIBADD ]) - PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2, + PHP_CHECK_LIBRARY(clntsh, OCIStmtPrepare2, [ AC_DEFINE(HAVE_OCI_STMT_PREPARE2,1,[ ]) ], [], [ |