You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by rp...@apache.org on 2009/03/28 22:26:51 UTC

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

Author: rpluem
Date: Sat Mar 28 21:26:50 2009
New Revision: 759594

URL: http://svn.apache.org/viewvc?rev=759594&view=rev
Log:
* Make LDAP working with APR 2.0 again by using apr-config instead of
  apu-config which is gone in APR 2.0.

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=759594&r1=759593&r2=759594&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/config.m4 (original)
+++ httpd/httpd/trunk/modules/aaa/config.m4 Sat Mar 28 21:26:50 2009
@@ -39,7 +39,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, [
-  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)
 ])
 

Modified: httpd/httpd/trunk/modules/ldap/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/config.m4?rev=759594&r1=759593&r2=759594&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/config.m4 (original)
+++ httpd/httpd/trunk/modules/ldap/config.m4 Sat Mar 28 21:26:50 2009
@@ -5,7 +5,11 @@
 
 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)
 ])