sniper Thu Nov 3 15:41:57 2005 EDT
Modified files: (Branch: PHP_4_4)
/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.1247.2.920.2.70&r2=1.1247.2.920.2.71&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.920.2.70 php-src/NEWS:1.1247.2.920.2.71
--- php-src/NEWS:1.1247.2.920.2.70 Thu Nov 3 15:30:59 2005
+++ php-src/NEWS Thu Nov 3 15:41:54 2005
@@ -3,6 +3,7 @@
?? ??? 2006, Version 4.4.2
- Backport missing imap_mailcompose fixes from 5.X. (Ilia)
- Added missing safe_mode/open_basedir checks in cURL extension. (Ilia)
+- Fixed bug #35078 (configure does not find ldap_start_tls_s). (Jani)
- Fixed bug #35071 (Wrong fopen mode used in GD safe-mode checks). (Jani)
- Fixed bug #35067, #35063 (key(),current() need to work by reference). (Ilia)
- Fixed bug #35059 (Apache2 crash with mod_rewrite). (Ilia)
http://cvs.php.net/diff.php/php-src/ext/ldap/config.m4?r1=1.26.2.8&r2=1.26.2.8.2.1&ty=u
Index: php-src/ext/ldap/config.m4
diff -u php-src/ext/ldap/config.m4:1.26.2.8
php-src/ext/ldap/config.m4:1.26.2.8.2.1
--- php-src/ext/ldap/config.m4:1.26.2.8 Sun May 8 12:06:24 2005
+++ php-src/ext/ldap/config.m4 Thu Nov 3 15:41:56 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.26.2.8 2005/05/08 16:06:24 sniper Exp $
+dnl $Id: config.m4,v 1.26.2.8.2.1 2005/11/03 20:41:56 sniper Exp $
dnl
AC_DEFUN([PHP_LDAP_CHECKS], [
@@ -110,30 +110,32 @@
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
+ LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
+
+ 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 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
