--- ext/ldap/config.m4   2005-11-03 20:41:56.000000000 +0000
+++ ext/ldap/config.m4   2006-08-24 13:05:51.694705496 +0000
@@ -113,8 +113,12 @@
   dnl Save original values
   _SAVE_CPPFLAGS=$CPPFLAGS
   _SAVE_LDFLAGS=$LDFLAGS
-  LDFLAGS="$LDFLAGS $LDAP_SHARED_LIBADD"
+  dnl Added ingnored -g ldflags for readability/debugging
+  LDFLAGS="-g $LDFLAGS -g $LDAP_SHARED_LIBADD -g"
   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
+  dnl Changing order of operands for ac_link during this test to permit --as-needed
+  dnl _SAVE_AC_LINK=$ac_link
+  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS conftest.$ac_ext $LDFLAGS $LIBS >&5'
 
   dnl Check for 3 arg ldap_set_rebind_proc
   AC_CACHE_CHECK([for 3 arg ldap_set_rebind_proc], ac_cv_3arg_setrebindproc,
@@ -138,4 +142,6 @@
   dnl Restore original values
   CPPFLAGS=$_SAVE_CPPFLAGS
   LDFLAGS=$_SAVE_LDFLAGS
+  dnl And Return the environment to normal
+  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 fi