For apr-util-1.3 seperate ldap link options, and default to old behavoir

when linking against apr-util-1.2.

Backports: 663663
Reviewed by: rpluem, fielding, minfrin,

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@665732 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index 836958a2a7cec706467cf7f99247c2996d76774a..434a43ec8f7956fccee917e174a382d99ab2be82 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -588,7 +588,9 @@ APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[
   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)

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index e2c057d21272c1802e990381f419d2be574fe401..3cdd0a26c023b25f9d745c54dcb7dc40063ffc5a 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -34,7 +34,10 @@ APACHE_MODULE(authz_owner, 'require file-owner' authorization control, , , most)
 
 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.

diff --git a/modules/ldap/config.m4 b/modules/ldap/config.m4
index 25a92af47323f797bd7557773a4b1fd2b1adf813..a598d250d1e83393c7540a361b79e33e24e440fe 100644 (file)
--- a/modules/ldap/config.m4
+++ b/modules/ldap/config.m4
@@ -4,6 +4,9 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 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