svn commit: r1150231 - in /httpd/httpd/trunk/modules: aaa/config.m4 ldap/config.m4

[rj...@apache.org]

Author: rjung
Date: Sat Jul 23 22:24:55 2011
New Revision: 1150231

URL: http://svn.apache.org/viewvc?rev=1150231&view=rev
Log:
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.

...

Modified:
    httpd/httpd/trunk/modules/aaa/config.m4
    httpd/httpd/trunk/modules/ldap/config.m4

Modified: httpd/httpd/trunk/modules/aaa/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/config.m4?rev=1150231&r1=1150230&r2=1150231&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/config.m4 (original)
+++ httpd/httpd/trunk/modules/aaa/config.m4 Sat Jul 23 22:24:55 2011
@@ -41,10 +41,11 @@ dnl LDAP authentication module. This mod
 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)
 ])
 

Modified: httpd/httpd/trunk/modules/ldap/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/config.m4?rev=1150231&r1=1150230&r2=1150231&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/config.m4 (original)
+++ httpd/httpd/trunk/modules/ldap/config.m4 Sat Jul 23 22:24:55 2011
@@ -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)
 ])