diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 58d994c10ec9..7221df365354 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -15,6 +15,10 @@ AC_DEFUN([PHP_LDAP_CHECKS], [ LDAP_DIR=$1 LDAP_INCDIR=$1/ldap/public LDAP_LIBDIR=$1/$PHP_LIBDIR + elif test -f $1/sdk/include/ldap.h; then + LDAP_DIR=$1 + LDAP_INCDIR=$1/sdk/include + LDAP_LIBDIR=$1 fi ]) @@ -148,6 +152,8 @@ if test "$PHP_LDAP" != "no"; then AC_DEFINE(HAVE_ORALDAP,1,[ ]) if test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then AC_DEFINE(HAVE_ORALDAP_10,1,[ ]) + elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then + AC_DEFINE(HAVE_ORALDAP_11,1,[ ]) fi else AC_MSG_ERROR(Cannot find ldap libraries in $LDAP_LIBDIR.) diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h index 751e57775771..4efab28f26db 100644 --- a/ext/ldap/php_ldap.h +++ b/ext/ldap/php_ldap.h @@ -23,7 +23,7 @@ #ifndef PHP_LDAP_H #define PHP_LDAP_H -#ifndef HAVE_ORALDAP +#if !defined(HAVE_OCI8) && !defined(HAVE_ORALDAP) #include #endif