sniper Tue Dec 3 04:36:31 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/ldap config.m4
Log:
MFH: Fixed build with iPlanet LDAP SDK 5.x
Index: php4/ext/ldap/config.m4
diff -u php4/ext/ldap/config.m4:1.26 php4/ext/ldap/config.m4:1.26.2.1
--- php4/ext/ldap/config.m4:1.26 Fri Sep 27 06:38:08 2002
+++ php4/ext/ldap/config.m4 Tue Dec 3 04:36:31 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.26 2002/09/27 10:38:08 derick Exp $
+dnl $Id: config.m4,v 1.26.2.1 2002/12/03 09:36:31 sniper Exp $
dnl
AC_DEFUN(PHP_LDAP_CHECKS, [
@@ -55,6 +55,16 @@
elif test -f $LDAP_LIBDIR/libldap.so.3; then
PHP_ADD_LIBRARY_WITH_PATH(ldap, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+ elif test -f $LDAP_LIBDIR/libssldap50.so -o -f $LDAP_LIBDIR/libssldap50.sl; then
+ if test -n "$LDAP_PTHREAD"; then
+ PHP_ADD_LIBRARY($LDAP_PTHREAD)
+ fi
+ PHP_ADD_LIBRARY_WITH_PATH(nspr4, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(plc4, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(plds4, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(ssldap50, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
+ AC_DEFINE(HAVE_NSLDAP,1,[ ])
+
elif test -f $LDAP_LIBDIR/libldapssl41.so -o -f $LDAP_LIBDIR/libldapssl41.sl; then
if test -n "$LDAP_PTHREAD"; then
PHP_ADD_LIBRARY($LDAP_PTHREAD)
@@ -86,7 +96,10 @@
elif test -f $LDAP_LIBDIR/libclntsh.so; then
PHP_ADD_LIBRARY_WITH_PATH(clntsh, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
AC_DEFINE(HAVE_ORALDAP,1,[ ])
- fi
+
+ else
+ AC_MSG_ERROR(Cannot find ldap libraries in $LDAP_LIBDIR.)
+ fi
PHP_ADD_INCLUDE($LDAP_INCDIR)
PHP_SUBST(LDAP_SHARED_LIBADD)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
