@- Fixed conflict with OpenLDAP and Oracle 8.1.x (Jani)

# PR: 4257,4698,5527,6112,6650,7195

diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index a9fef07379ac6a6b0f73a515884c2e2cc8214f53..1fc55fafa093ba900b6c8bad9cdb69dc4046a126 100644 (file)
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -67,7 +67,8 @@ if test "$PHP_OCI8" != "no"; then
          ;;
 
        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!)

diff --git a/ext/oracle/config.m4 b/ext/oracle/config.m4
index a95a7414d81e06581936ce46b48ae69c0b4c8b55..58d12695c1ef60d845179380c3b37eed68892787 100644 (file)
--- a/ext/oracle/config.m4
+++ b/ext/oracle/config.m4
@@ -143,7 +143,8 @@ if test "$PHP_ORACLE" != "no"; then
          ;;
 
        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!)