diff options
| -rw-r--r-- | ext/oci8/config.m4 | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index eec2849e1d..7a655a2a47 100644 --- a/ext/oci8/config.m4 +++ b/ext/oci8/config.m4 @@ -143,7 +143,9 @@ fi PHP_OCI8_INSTANT_CLIENT="no" -if test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then +if test "`echo $PHP_OCI8`" = "instantclient"; then + PHP_OCI8_INSTANT_CLIENT="yes" +elif test "`echo $PHP_OCI8 | cut -d, -f2`" = "instantclient"; then 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 @@ -345,14 +347,21 @@ if test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then elif test "$PHP_OCI8" != "no" && test "$PHP_OCI8_INSTANT_CLIENT" != "no"; then + AC_CHECK_SIZEOF(long int, 4) + LIBDIR_SUFFIX="" + if test "$ac_cv_sizeof_long_int" = "8" ; then + LIBDIR_SUFFIX=64 + fi + AC_MSG_CHECKING([Oracle Instant Client directory]) if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then +dnl Find the directory if user specified "instantclient" but did not give a dir. dnl Generally the Instant Client can be anywhere so the user must pass in the dnl directory to the libraries. But on Linux we default to the most recent dnl version in /usr/lib - PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client/lib 2> /dev/null | tail -1` + PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${LIBDIR_SUFFIX}/lib 2> /dev/null | tail -1` if test -z "$PHP_OCI8_INSTANT_CLIENT"; then - AC_MSG_ERROR([Oracle Instant Client directory not found. Try --with-oci8=instantclient,DIR]) + AC_MSG_ERROR([Oracle Instant Client directory /usr/lib/oracle/.../client${LIBDIR_SUFFIX}/lib not found. Try --with-oci8=instantclient,DIR]) fi fi AC_MSG_RESULT($PHP_OCI8_INSTANT_CLIENT) @@ -362,7 +371,7 @@ dnl version in /usr/lib AC_MSG_CHECKING([Oracle Instant Client SDK header directory]) dnl Header directory for Instant Client SDK RPM install - OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client/lib[/]*$!/usr/include/oracle/\1/client!'` + OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\(.*\)/lib/*$!/usr/include/oracle/\1/client\2!'` dnl Header directory for Instant Client SDK zip file install OCISDKZIPINC=$PHP_OCI8_INSTANT_CLIENT/sdk/include |