Index: configure.in
===================================================================
--- configure.in	(revision 663640)
+++ configure.in	(working copy)
@@ -599,7 +599,9 @@
   AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
 
 dnl APR should go after the other libs, so the right symbols can be picked up
-AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`"
+apulinklibs="`$apu_config --avoid-ldap --link-libtool --libs`" \
+ || apulinklibs="`$apu_config --link-libtool --libs`"
+AP_LIBS="$AP_LIBS $apulinklibs  `$apr_config --link-libtool --libs`" 
 APACHE_SUBST(AP_LIBS)
 APACHE_SUBST(AP_BUILD_SRCLIB_DIRS)
 APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS)
Index: modules/aaa/config.m4
===================================================================
--- modules/aaa/config.m4	(revision 663640)
+++ modules/aaa/config.m4	(working copy)
@@ -42,7 +42,10 @@
 
 dnl LDAP authentication module. This module has both the authn and authz
 dnl modules in one, so as to share the LDAP server config directives.
-APACHE_MODULE(authnz_ldap, LDAP based authentication, , , no)
+APACHE_MODULE(authnz_ldap, LDAP based authentication, , , no, [
+  MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_AUTHNZ_LDAP_LDADD=""
+  AC_SUBST(MOD_AUTHNZ_LDAP_LDADD)
+])
 
 dnl - and just in case all of the above punt; a default handler to
 dnl keep the bad guys out.
Index: modules/ldap/config.m4
===================================================================
--- modules/ldap/config.m4	(revision 663640)
+++ modules/ldap/config.m4	(working copy)
@@ -4,6 +4,9 @@
 APACHE_MODPATH_INIT(ldap)
 
 ldap_objects="util_ldap.lo util_ldap_cache.lo util_ldap_cache_mgr.lo"
-APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no)
+APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no, [
+  MOD_LDAP_LDADD="`$apu_config --ldap-libs`" || MOD_LDAP_LDADD=""
+  AC_SUBST(MOD_LDAP_LDADD)
+])
 
 APACHE_MODPATH_FINISH