Adding Oracle LDAP SDK support

diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 4750d82e1c66a25d7d19a69fe5d43c6ec5ada97f..377c22117d97479a9afae3bfb9cb9803187151c7 100644 (file)
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -15,6 +15,10 @@ if test "$PHP_LDAP" != "no"; then
                        LDAP_DIR=$i
                        LDAP_INCDIR=$i/include/umich-ldap
                        LDAP_LIBDIR=$i/lib
+               elif test -f $i/ldap/public/ldap.h; then
+                       LDAP_DIR=$i
+                       LDAP_INCDIR=$i/ldap/public
+                       LDAP_LIBDIR=$i/lib
                fi
        done
 
@@ -56,6 +60,9 @@ if test "$PHP_LDAP" != "no"; then
        elif test -f $LDAP_LIBDIR/libumich_ldap.so; then
                AC_ADD_LIBRARY_WITH_PATH(umich_lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
                AC_ADD_LIBRARY_WITH_PATH(umich_ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+       elif test -f $LDAP_LIBDIR/libclntsh.so; then
+               AC_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+               AC_DEFINE(HAVE_ORALDAP,1,[ ])
        fi  
 
        AC_ADD_INCLUDE($LDAP_INCDIR)

diff --git a/ext/ldap/php_ldap.h b/ext/ldap/php_ldap.h
index 3cf4592fe5e7b9df764d5ee51390493a78102f15..0f18e277e46598ac2451a582877e43e8b10a26d2 100644 (file)
--- a/ext/ldap/php_ldap.h
+++ b/ext/ldap/php_ldap.h
@@ -23,7 +23,9 @@
 #ifndef PHP_LDAP_H
 #define PHP_LDAP_H
 
+#ifndef HAVE_ORALDAP
 #include <lber.h>
+#endif
 #include <ldap.h>
 
 extern zend_module_entry ldap_module_entry;