Index: apu-config.in
===================================================================
--- apu-config.in	1 Mar 2005 09:55:43 -0000	1.1.1.1
+++ apu-config.in	1 Mar 2005 09:58:39 -0000	1.2
@@ -32,6 +32,8 @@
 LDFLAGS="@APRUTIL_LDFLAGS@"
 
 APRUTIL_LIBNAME="@APRUTIL_LIBNAME@"
+APRUTIL_LDAP_LIBS="@APRUTIL_LDAP_LIBS@"
+APRUTIL_LDAP_LDFLAGS="@APRUTIL_LDAP_LDFLAGS@"
 
 APU_SOURCE_DIR="@abs_srcdir@"
 APU_BUILD_DIR="@abs_builddir@"
@@ -53,6 +55,7 @@
   --includedir      print location where headers are installed
   --ldflags         print linker flags
   --libs            print library information
+  --ldap-libs       print ldap link library information
   --srcdir          print APR-util source directory
   --link-ld         print link switch(es) for linking to APR-util
   --link-libtool    print the libtool inputs for linking to APR-util
@@ -111,6 +114,12 @@
     ;;
     --libs)
     flags="$flags $LIBS"
+    ;;
+    --ldap-libs)
+    flags="$flags $APRUTIL_LDAP_LIBS"
+    ;;
+    --ldap-ldflags)
+    flags="$flags $APRUTIL_LDAP_LDFLAGS"
     ;;
     --includedir)
     if test "$location" = "installed"; then
Index: configure.in
===================================================================
--- configure.in	5 May 2006 03:10:40 -0000	1.1.1.3
+++ configure.in	5 May 2006 03:30:17 -0000	1.4
@@ -161,6 +161,8 @@
 APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
 
 AC_SUBST(APRUTIL_EXPORT_LIBS)
+AC_SUBST(APRUTIL_LDAP_LIBS)
+AC_SUBST(APRUTIL_LDAP_LDFLAGS)
 AC_SUBST(APRUTIL_PRIV_INCLUDES)
 AC_SUBST(APRUTIL_INCLUDES)
 AC_SUBST(APRUTIL_LDFLAGS)
Index: export_vars.sh.in
===================================================================
--- export_vars.sh.in	1 Mar 2005 09:55:44 -0000	1.1.1.1
+++ export_vars.sh.in	1 Mar 2005 09:58:39 -0000	1.2
@@ -10,4 +10,5 @@
 
 APRUTIL_EXPORT_INCLUDES="@APRUTIL_INCLUDES@"
 APRUTIL_EXPORT_LIBS="@APRUTIL_EXPORT_LIBS@"
+APRUTIL_LDAP_LIBS="@APRUTIL_LDAP_LIBS@"
 APRUTIL_LDFLAGS="@APRUTIL_LDFLAGS@"
Index: build/apu-conf.m4
===================================================================
--- build/apu-conf.m4	5 May 2006 03:10:52 -0000	1.1.1.2
+++ build/apu-conf.m4	7 Jul 2007 05:24:55 -0000	1.4
@@ -222,8 +222,7 @@
     unset ac_cv_lib_${ldaplib}___ldap_init
     AC_CHECK_LIB(${ldaplib}, ldap_init, 
       [
-        APR_ADDTO(APRUTIL_EXPORT_LIBS,[-l${ldaplib} ${extralib}])
-        APR_ADDTO(APRUTIL_LIBS,[-l${ldaplib} ${extralib}])
+        APR_ADDTO(APRUTIL_LDAP_LIBS,[-l${ldaplib} ${extralib}])
         AC_CHECK_LIB(${ldaplib}, ldapssl_install_routines, apu_has_ldap_netscape_ssl="1", , ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldap_start_tls_s, apu_has_ldap_starttls="1", , ${extralib})
         apu_has_ldap="1";
@@ -256,7 +255,7 @@
     fi
     if test -n "$with_ldap_lib"; then
       LDFLAGS="$LDFLAGS -L$with_ldap_lib"
-      APR_ADDTO(APRUTIL_LDFLAGS, [-L$with_ldap_lib])
+      APR_ADDTO(APRUTIL_LDAP_LDFLAGS, [-L$with_ldap_lib])
     fi
 
     LIBLDAP="$withval"
@@ -269,7 +268,10 @@
       APU_FIND_LDAPLIB("ldapssl20")
       APU_FIND_LDAPLIB("ldap", "-llber")
       APU_FIND_LDAPLIB("ldap", "-llber -lresolv")
+      APU_FIND_LDAPLIB("ldap", "-llber -lssl -lcrypto")
+      APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lssl -lcrypto")
       APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl")
+      APU_FIND_LDAPLIB("ldap", "-llber -lresolv -lsocket -lnsl -lssl -lcrypto")
       APU_FIND_LDAPLIB("ldap", "-ldl -lpthread")
     else
       APU_FIND_LDAPLIB($LIBLDAP)