diff options
| author | foobar <sniper@php.net> | 2005-11-03 20:41:05 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-11-03 20:41:05 +0000 |
| commit | 6352110b7ff0ff8356b360fa396cc239bc79eb11 (patch) | |
| tree | 1c34326d1620cd250df811dd43a91b47e2131b8e | |
| parent | 36d3c24c6e2237a4c564cf2837a685df33006424 (diff) | |
| download | php-git-6352110b7ff0ff8356b360fa396cc239bc79eb11.tar.gz | |
- Fixed bug #35078 (configure does not find ldap_start_tls_s)
| -rw-r--r-- | ext/ldap/config.m4 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4 index 1d6282a554..f70799a501 100644 --- a/ext/ldap/config.m4 +++ b/ext/ldap/config.m4 @@ -156,23 +156,24 @@ if test "$PHP_LDAP" != "no"; then PHP_ADD_INCLUDE($LDAP_INCDIR) PHP_SUBST(LDAP_SHARED_LIBADD) AC_DEFINE(HAVE_LDAP,1,[ ]) - - dnl Check for 3 arg ldap_set_rebind_proc + + dnl Save original values _SAVE_CPPFLAGS=$CPPFLAGS _SAVE_LDFLAGS=$LDFLAGS CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR" + LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD" + + dnl Check for 3 arg ldap_set_rebind_proc 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)], ac_cv_3arg_setrebindproc=yes, ac_cv_3arg_setrebindproc=no)]) if test "$ac_cv_3arg_setrebindproc" = yes; then AC_DEFINE(HAVE_3ARG_SETREBINDPROC,1,[Whether 3 arg set_rebind_proc()]) fi - CPPFLAGS=$_SAVE_CPPFLAGS 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_result ldap_parse_reference ldap_start_tls_s]) - LDFLAGS=$_SAVE_LDFLAGS dnl dnl SASL check @@ -184,10 +185,11 @@ if test "$PHP_LDAP" != "no"; then 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.]) ]) + + dnl Restore original values + CPPFLAGS=$_SAVE_CPPFLAGS LDFLAGS=$_SAVE_LDFLAGS fi |