From: Stig Venaas <venaas@php.net>
Date: Sat, 19 Aug 2000 14:10:11 +0000 (+0000)
Subject: Adding Oracle LDAP SDK support
X-Git-Tag: php-4.0.2RC1~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90eac6a390070c62cbd87709b76dd0de257851ac;p=php

Adding Oracle LDAP SDK support
---

diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 4750d82e1c..377c22117d 100644
--- 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 3cf4592fe5..0f18e277e4 100644
--- 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;