wez Tue Nov 29 22:18:12 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/pdo_oci config.m4
Log:
Fix PECL Bug #6102; fails to configure for instant client on OSX.
In addition, make it work for the instant client install on my gentoo box.
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.14.2.2&r2=1.14.2.3&ty=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.14.2.2
php-src/ext/pdo_oci/config.m4:1.14.2.3
--- php-src/ext/pdo_oci/config.m4:1.14.2.2 Sun Nov 27 13:36:11 2005
+++ php-src/ext/pdo_oci/config.m4 Tue Nov 29 22:18:09 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.14.2.2 2005/11/27 18:36:11 tony2001 Exp $
+dnl $Id: config.m4,v 1.14.2.3 2005/11/30 03:18:09 wez Exp $
if test "$PHP_PDO" != "no"; then
@@ -61,10 +61,24 @@
elif test -f
$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include/oci.h ; then
PHP_ADD_INCLUDE($PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include)
AC_MSG_RESULT($PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/include)
+ elif test -f $PDO_OCI_IC_PREFIX/sdk/include/oci.h ; then
+ PHP_ADD_INCLUDE($PDO_OCI_PREFIX/sdk/include)
+ AC_MSG_RESULT($PDO_OCI_PREFIX/sdk/include)
+ elif test -f $PDO_OCI_IC_PREFIX/client/include/oci.h ; then
+ PHP_ADD_INCLUDE($PDO_OCI_PREFIX/client/include)
+ AC_MSG_RESULT($PDO_OCI_PREFIX/client/include)
else
AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in
your instant client install])
fi
- PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
+ if test -f
"$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then
+
PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
+ elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib"
+ elif test -f "$PDO_OCI_IC_PREFIX/libclntsh.so" ; then
+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX"
+ else
+ AC_MSG_ERROR([I'm too dumb to figure out where the libraries are in your
instant client install])
+ fi
PDO_OCI_VERSION="`echo $PDO_OCI_IC_VERS | cut -d. -f1-2`"
else
if test -d "$PDO_OCI_DIR/rdbms/public"; then
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
