From 5ae1ca60bc35ce76684093e413c3c9d1a99f0f23 Mon Sep 17 00:00:00 2001 From: Rainer Jung Date: Sat, 23 Jul 2011 22:24:55 +0000 Subject: [PATCH] Bring part some parts of r1142938 which were removed by the big ldap revert r1150179. Original commit log: Use APR_ADDTO instead of APR_SETVAR or direct variable assignment. ... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1150231 13f79535-47bb-0310-9956-ffa450edef68 --- modules/aaa/config.m4 | 5 +++-- modules/ldap/config.m4 | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4 index 2bd87b8191..10958e2382 100644 --- a/modules/aaa/config.m4 +++ b/modules/aaa/config.m4 @@ -41,10 +41,11 @@ 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, [ if test -z "$apu_config" ; then - MOD_AUTHNZ_LDAP_LDADD="`$apr_config --ldap-libs`" + LDAP_LIBS="`$apr_config --ldap-libs`" else - MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`" + LDAP_LIBS="`$apu_config --ldap-libs`" fi + APR_ADDTO(MOD_AUTHNZ_LDAP_LDADD, [$LDAP_LIBS]) AC_SUBST(MOD_AUTHNZ_LDAP_LDADD) ]) diff --git a/modules/ldap/config.m4 b/modules/ldap/config.m4 index f962dda2d7..2c915b5e8f 100644 --- a/modules/ldap/config.m4 +++ b/modules/ldap/config.m4 @@ -6,10 +6,11 @@ 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, [ if test -z "$apu_config" ; then - MOD_LDAP_LDADD="`$apr_config --ldap-libs`" + LDAP_LIBS="`$apr_config --ldap-libs`" else - MOD_LDAP_LDADD="`$apu_config --ldap-libs`" + LDAP_LIBS="`$apu_config --ldap-libs`" fi + APR_ADDTO(MOD_LDAP_LDADD, [$LDAP_LIBS]) AC_SUBST(MOD_LDAP_LDADD) ]) -- 2.40.0