cvs: php-src /ext/ldap config.m4
| From: | Jani Taskinen | Date: | Tue, 01 Jul 2003 00:02:13 +0000 |
| Subject: | cvs: php-src /ext/ldap config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-22203@lists.php.net to get a copy of this message | ||
sniper Mon Jun 30 20:02:13 2003 EDT
Modified files:
/php-src/ext/ldap config.m4
Log:
Fixed bug #24025 (Can not build with shared ldap support)
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.33 php-src/ext/ldap/config.m4:1.34
--- php-src/ext/ldap/config.m4:1.33 Fri Jun 13 09:30:46 2003
+++ php-src/ext/ldap/config.m4 Mon Jun 30 20:02:13 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.33 2003/06/13 13:30:46 sniper Exp $
+dnl $Id: config.m4,v 1.34 2003/07/01 00:02:13 sniper Exp $
dnl
AC_DEFUN(PHP_LDAP_CHECKS, [
@@ -157,6 +157,7 @@
dnl Check for 3 arg ldap_set_rebind_proc
_SAVE_CPPFLAGS=$CPPFLAGS
+ _SAVE_LDFLAGS=$LDFLAGS
CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
[AC_TRY_COMPILE([#include <ldap.h>], [ldap_set_rebind_proc(0,0,0)],
@@ -169,7 +170,8 @@
dnl Solaris 2.8 claims to be 2004 API, but doesn't have
dnl ldap_parse_reference() nor ldap_start_tls_s()
AC_CHECK_FUNCS([ldap_parse_reference ldap_start_tls_s])
-
+ LDFLAGS=$_SAVE_LDFLAGS
+
dnl
dnl SASL check
dnl
@@ -180,7 +182,10 @@
dnl
dnl Sanity check
dnl
+ _SAVE_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
AC_CHECK_FUNC(ldap_bind_s, [], [
AC_MSG_ERROR([LDAP build check failed. Please check config.log for more information.])
])
+ LDFLAGS=$_SAVE_LDFLAGS
fi