From 4a895b6919782d11b2f074cb2aaa549d4be32f49 Mon Sep 17 00:00:00 2001 From: foobar Date: Sun, 29 Oct 2000 04:10:07 +0000 Subject: [PATCH] @- Fixed conflict with OpenLDAP and Oracle 8.1.x (Jani) # PR: 4257,4698,5527,6112,6650,7195 --- ext/oci8/config.m4 | 3 ++- ext/oracle/config.m4 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4 index a9fef07379..1fc55fafa0 100644 --- 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 a95a7414d8..58d12695c1 100644 --- 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!) -- 2.40.0