From 3d26a25fe965a5cf9b4a3655f5184378c788ae61 Mon Sep 17 00:00:00 2001
From: foobar <sniper@php.net>
Date: Thu, 3 Nov 2005 20:41:56 +0000
Subject: [PATCH] MFH: - Fixed bug #35078 (configure does not find
 ldap_start_tls_s)

---
 NEWS               |  1 +
 ext/ldap/config.m4 | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 5e6c9e0661..b6ce9ea0bb 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP 4                                                                      NEWS
 ?? ??? 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)
diff --git a/ext/ldap/config.m4 b/ext/ldap/config.m4
index 28dd19491d..81396e33c1 100644
--- a/ext/ldap/config.m4
+++ b/ext/ldap/config.m4
@@ -110,30 +110,32 @@ if test "$PHP_LDAP" != "no"; then
   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 
-- 
2.40.0