From a020591640f8d252b919d3b29a8219076ed47b47 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Thu, 5 Jun 2008 17:12:22 +0000 Subject: [PATCH] For *trunk/* development, presume at least apr-1.3 (now released) for seperation of ldap link options. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@663663 13f79535-47bb-0310-9956-ffa450edef68 --- configure.in | 3 ++- modules/aaa/config.m4 | 5 ++++- modules/ldap/config.m4 | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index a4d82e9d4f..9faa959a1a 100644 --- a/configure.in +++ b/configure.in @@ -599,7 +599,8 @@ APACHE_HELP_STRING(--with-suexec-umask,umask for suexec'd process),[ AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] ) dnl APR should go after the other libs, so the right symbols can be picked up -AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`" +AP_LIBS="$AP_LIBS `$apu_config --avoid-ldap --link-libtool --libs`" +AP_LIBS="$AP_LIBS `$apr_config --link-libtool --libs`" APACHE_SUBST(AP_LIBS) APACHE_SUBST(AP_BUILD_SRCLIB_DIRS) APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS) diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4 index b5a5b39cd0..857977ee53 100644 --- a/modules/aaa/config.m4 +++ b/modules/aaa/config.m4 @@ -42,7 +42,10 @@ 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) +APACHE_MODULE(authnz_ldap, LDAP based authentication, , , no, [ + MOD_AUTHNZ_LDAP_LDADD="`$apu_config --ldap-libs`" + AC_SUBST(MOD_AUTHNZ_LDAP_LDADD) +]) dnl - and just in case all of the above punt; a default handler to dnl keep the bad guys out. diff --git a/modules/ldap/config.m4 b/modules/ldap/config.m4 index 25a92af473..5625280304 100644 --- a/modules/ldap/config.m4 +++ b/modules/ldap/config.m4 @@ -4,6 +4,9 @@ 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, , no) +APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no, [ + MOD_LDAP_LDADD="`$apu_config --ldap-libs`" + AC_SUBST(MOD_LDAP_LDADD) +]) APACHE_MODPATH_FINISH -- 2.40.0