mod_authnz_ldap / mod_ldap: Use new APR LDAP API.

modules/aaa/config.m4

@@ -49,21 +49,7 @@ 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, , , most, [
-  APACHE_CHECK_APR_HAS_LDAP
-  if test "$ac_cv_APR_HAS_LDAP" = "yes" ; then
-    if test -z "$apu_config" ; then
-      LDAP_LIBS="`$apr_config --ldap-libs`"
-    else
-      LDAP_LIBS="`$apu_config --ldap-libs`"
-    fi
-    APR_ADDTO(MOD_AUTHNZ_LDAP_LDADD, [$LDAP_LIBS])
-    AC_SUBST(MOD_AUTHNZ_LDAP_LDADD)
-  else
-    AC_MSG_WARN([apr/apr-util is compiled without ldap support])
-    enable_authnz_ldap=no
-  fi
-])
+APACHE_MODULE(authnz_ldap, LDAP based authentication, , , most)
 
 dnl FastCGI authorizer interface, supporting authn and authz.
 APACHE_MODULE(authnz_fcgi,

modules/ldap/config.m4

@@ -4,21 +4,7 @@ dnl APACHE_MODULE(name, helptext[, objects[, structname[, default[, config]]]])
 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, , most , [
-  APACHE_CHECK_APR_HAS_LDAP
-  if test "$ac_cv_APR_HAS_LDAP" = "yes" ; then
-    if test -z "$apu_config" ; then
-      LDAP_LIBS="`$apr_config --ldap-libs`"
-    else
-      LDAP_LIBS="`$apu_config --ldap-libs`"
-    fi
-    APR_ADDTO(MOD_LDAP_LDADD, [$LDAP_LIBS])
-    AC_SUBST(MOD_LDAP_LDADD)
-  else
-    AC_MSG_WARN([apr/apr-util is compiled without ldap support])
-    enable_ldap=no
-  fi
-])
+APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , most)
 
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])