cvs: php4 /ext/oci8 config.m4 /ext/oracle config.m4
| From: | Jani Taskinen | Date: | Sun, 29 Oct 2000 04:10:07 +0000 |
| Subject: | cvs: php4 /ext/oci8 config.m4 /ext/oracle config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2330@lists.php.net to get a copy of this message | ||
sniper Sat Oct 28 21:10:07 2000 EDT
Modified files:
/php4/ext/oci8 config.m4
/php4/ext/oracle config.m4
Log:
@- Fixed conflict with OpenLDAP and Oracle 8.1.x (Jani)
# PR: 4257,4698,5527,6112,6650,7195
Index: php4/ext/oci8/config.m4
diff -u php4/ext/oci8/config.m4:1.21 php4/ext/oci8/config.m4:1.22
--- php4/ext/oci8/config.m4:1.21 Thu Jun 22 17:46:04 2000
+++ php4/ext/oci8/config.m4 Sat Oct 28 21:10:06 2000
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.21 2000/06/23 00:46:04 rasmus Exp $
+dnl $Id: config.m4,v 1.22 2000/10/29 04:10:06 sniper Exp $
AC_DEFUN(AC_OCI8_VERSION,[
AC_MSG_CHECKING([Oracle version])
@@ -67,7 +67,8 @@
;;
8.1)
- AC_ADD_LIBRARY_WITH_PATH(clntsh, $OCI8_DIR/lib, OCI8_SHARED_LIBADD)
+ AC_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD)
+ AC_ADD_LIBPATH($OCI8_DIR/lib, OCI8_SHARED_LIBADD)
;;
*)
AC_MSG_ERROR(Unsupported Oracle version!)
Index: php4/ext/oracle/config.m4
diff -u php4/ext/oracle/config.m4:1.15 php4/ext/oracle/config.m4:1.16
--- php4/ext/oracle/config.m4:1.15 Thu Jun 22 17:46:04 2000
+++ php4/ext/oracle/config.m4 Sat Oct 28 21:10:06 2000
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.15 2000/06/23 00:46:04 rasmus Exp $
+dnl $Id: config.m4,v 1.16 2000/10/29 04:10:06 sniper Exp $
AC_DEFUN(AC_ORACLE_VERSION,[
AC_MSG_CHECKING([Oracle version])
@@ -143,7 +143,8 @@
;;
8.1)
- AC_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
+ AC_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD)
+ AC_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
;;
*)
AC_MSG_ERROR(Unsupported Oracle version!)