From: Ruediger Pluem <rpluem@apache.org>
Date: Sat, 28 Mar 2009 21:26:50 +0000 (+0000)
Subject: * Make LDAP working with APR 2.0 again by using apr-config instead of
X-Git-Tag: 2.3.3~768
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f76abc0cb4d3c871cfb7b09746d1f30d7709fa5a;p=thirdparty%2Fapache%2Fhttpd.git

* Make LDAP working with APR 2.0 again by using apr-config instead of
  apu-config which is gone in APR 2.0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@759594 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 414c012d543..91060622ab6 100644
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -39,7 +39,11 @@ APACHE_MODULE(authz_core, core authorization provider vector module, , , yes)
 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, [
-  MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`"
+  if test -z "$apu_config" ; then
+      MOD_AUTHNZ_LDAP_LDADD="`$apr_config --ldap-libs`"
+  else
+      MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`"
+  fi
   AC_SUBST(MOD_AUTHNZ_LDAP_LDADD)
 ])
 
diff --git a/modules/ldap/config.m4 b/modules/ldap/config.m4
index 56252803046..2f0bbf9e394 100644
--- a/modules/ldap/config.m4
+++ b/modules/ldap/config.m4
@@ -5,7 +5,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, [
-  MOD_LDAP_LDADD="`$apu_config --ldap-libs`"
+  if test -z "$apu_config" ; then
+      MOD_LDAP_LDADD="`$apr_config --ldap-libs`"
+  else
+      MOD_LDAP_LDADD="`$apu_config --ldap-libs`"
+  fi
   AC_SUBST(MOD_LDAP_LDADD)
 ])