svn commit: r665732 - in /httpd/httpd/branches/2.2.x: configure.in modules/aaa/config.m4 modules/ldap/config.m4

[wr...@apache.org]

Author: wrowe
Date: Mon Jun  9 09:04:46 2008
New Revision: 665732

URL: http://svn.apache.org/viewvc?rev=665732&view=rev
Log:
For apr-util-1.3 seperate ldap link options, and default to old behavoir
when linking against apr-util-1.2.

Backports: 663663
Reviewed by: rpluem, fielding, minfrin, 

Modified:
    httpd/httpd/branches/2.2.x/configure.in
    httpd/httpd/branches/2.2.x/modules/aaa/config.m4
    httpd/httpd/branches/2.2.x/modules/ldap/config.m4

Modified: httpd/httpd/branches/2.2.x/configure.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/configure.in?rev=665732&r1=665731&r2=665732&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/configure.in (original)
+++ httpd/httpd/branches/2.2.x/configure.in Mon Jun  9 09:04:46 2008
@@ -588,7 +588,9 @@
   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`"
+apulinklibs="`$apu_config --avoid-ldap --link-libtool --libs`" \
+ || apulinklibs="`$apu_config --link-libtool --libs`"
+AP_LIBS="$AP_LIBS $apulinklibs `$apr_config --link-libtool --libs`" 
 APACHE_SUBST(AP_LIBS)
 APACHE_SUBST(AP_BUILD_SRCLIB_DIRS)
 APACHE_SUBST(AP_CLEAN_SRCLIB_DIRS)

Modified: httpd/httpd/branches/2.2.x/modules/aaa/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/aaa/config.m4?rev=665732&r1=665731&r2=665732&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/aaa/config.m4 (original)
+++ httpd/httpd/branches/2.2.x/modules/aaa/config.m4 Mon Jun  9 09:04:46 2008
@@ -34,7 +34,10 @@
 
 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`" || MOD_AUTHNZ_LDAP_LDADD=""
+  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.

Modified: httpd/httpd/branches/2.2.x/modules/ldap/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/ldap/config.m4?rev=665732&r1=665731&r2=665732&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/ldap/config.m4 (original)
+++ httpd/httpd/branches/2.2.x/modules/ldap/config.m4 Mon Jun  9 09:04:46 2008
@@ -4,6 +4,9 @@
 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`" || MOD_LDAP_LDADD=""
+  AC_SUBST(MOD_LDAP_LDADD)
+])
 
 APACHE_MODPATH_FINISH