From f76abc0cb4d3c871cfb7b09746d1f30d7709fa5a Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Sat, 28 Mar 2009 21:26:50 +0000 Subject: [PATCH] * 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 --- modules/aaa/config.m4 | 6 +++++- modules/ldap/config.m4 | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4 index 414c012d54..91060622ab 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 5625280304..2f0bbf9e39 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) ]) -- 2.40.0