sniper Thu Nov 3 15:41:14 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/ldap config.m4
Log:
MFH: - Fixed bug #35078 (configure does not find ldap_start_tls_s)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.175&r2=1.2027.2.176&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.175 php-src/NEWS:1.2027.2.176
--- php-src/NEWS:1.2027.2.175 Thu Nov 3 10:01:30 2005
+++ php-src/NEWS Thu Nov 3 15:41:12 2005
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Nov 2005, PHP 5.1
- Fixed initializing and argument checking for posix_mknod(). (Derick)
+- Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani)
- Fixed bugs #35022, #35019 (Regression in the behavior of key() and current()
functions). (Ilia)
- Fixed bug #35017 (Exception thrown in error handler may cause unexpected
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.39.2.4&r2=1.39.2.5&ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.39.2.4 php-src/ext/ldap/config.m4:1.39.2.5
--- php-src/ext/ldap/config.m4:1.39.2.4 Mon Oct 24 18:46:26 2005
+++ php-src/ext/ldap/config.m4 Thu Nov 3 15:41:13 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.39.2.4 2005/10/24 22:46:26 sniper Exp $
+dnl $Id: config.m4,v 1.39.2.5 2005/11/03 20:41:13 sniper Exp $
dnl
AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -156,23 +156,24 @@
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 @@
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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
