cvs: php-src /ext/pdo_oci config.m4
| From: | Christopher Jones | Date: | Fri, 17 Aug 2007 13:33:07 +0000 |
| Subject: | cvs: php-src /ext/pdo_oci config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-45918@lists.php.net to get a copy of this message | ||
sixd Fri Aug 17 13:33:07 2007 UTC
Modified files:
/php-src/ext/pdo_oci config.m4
Log:
MFH: PDO_OCI: fix Instant Client build broken by logic correction in previous Solaris lib/lib32
fix
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_oci/config.m4?r1=1.21&r2=1.22&diff_format=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.21 php-src/ext/pdo_oci/config.m4:1.22
--- php-src/ext/pdo_oci/config.m4:1.21 Tue Aug 14 12:14:53 2007
+++ php-src/ext/pdo_oci/config.m4 Fri Aug 17 13:33:07 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.21 2007/08/14 12:14:53 tony2001 Exp $
+dnl $Id: config.m4,v 1.22 2007/08/17 13:33:07 sixd Exp $
if test "$PHP_PDO" != "no"; then
@@ -78,8 +78,6 @@
AC_MSG_RESULT([yes])
fi
- AC_PDO_OCI_CHECK_LIB_DIR($PDO_OCI_DIR)
-
if test "instantclient" = "
echo $PDO_OCI_DIR | cut -d, -f1" ;
then
PDO_OCI_IC_PREFIX="echo $PDO_OCI_DIR | cut -d, -f2"
PDO_OCI_IC_VERS="echo $PDO_OCI_DIR | cut -d, -f3"
@@ -110,6 +108,8 @@
fi
PDO_OCI_VERSION="echo $PDO_OCI_IC_VERS | cut -d. -f1-2"
else
+ AC_PDO_OCI_CHECK_LIB_DIR($PDO_OCI_DIR)
+
if test -d "$PDO_OCI_DIR/rdbms/public"; then
PHP_ADD_INCLUDE($PDO_OCI_DIR/rdbms/public)
PDO_OCI_INCLUDES="$PDO_OCI_INCLUDES -I$PDO_OCI_DIR/rdbms/public"
@@ -154,15 +154,19 @@
9.0)
PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
;;
+
10.1)
PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
;;
+
10.2)
PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
;;
+
11.1)
PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD)
;;
+
*)
AC_MSG_ERROR(Unsupported Oracle version! $PDO_OCI_VERSION)
;;