httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1142938 - in /httpd/httpd/trunk: CHANGES modules/aaa/config.m4 modules/filters/config.m4 modules/ldap/config.m4 modules/lua/config.m4 modules/proxy/config.m4 modules/ssl/config.m4 server/mpm/event/config3.m4
Date Tue, 05 Jul 2011 09:24:23 GMT
Author: rjung
Date: Tue Jul  5 09:24:23 2011
New Revision: 1142938

URL: http://svn.apache.org/viewvc?rev=1142938&view=rev
Log:
Allow to specify module specific custom linker flags
via the MOD_XXX_LDADD variables.

Use APR_ADDTO instead of APR_SETVAR or direct
variable assignment.

This is especially useful when building mod_lua
or mod_deflate against a lua resp. libz which
are installed in non-standard locations.
One can add "-R ..." to MOD_LUA_LDADD and
MOD_DEFLATE_LDADD before configure to fix
the RPATH/RUNPATH of those modules.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/aaa/config.m4
    httpd/httpd/trunk/modules/filters/config.m4
    httpd/httpd/trunk/modules/ldap/config.m4
    httpd/httpd/trunk/modules/lua/config.m4
    httpd/httpd/trunk/modules/proxy/config.m4
    httpd/httpd/trunk/modules/ssl/config.m4
    httpd/httpd/trunk/server/mpm/event/config3.m4

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1142938&r1=1142937&r2=1142938&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Jul  5 09:24:23 2011
@@ -26,6 +26,9 @@ Changes with Apache 2.3.14
   *) configure: tolerate dependency checking failures for modules if
      they have been enabled implicitely. [Rainer Jung]
 
+  *) configure: Allow to specify module specific custom linker flags via
+     the MOD_XXX_LDADD variables. [Rainer Jung]
+
 Changes with Apache 2.3.13
 
   *) ab: Support specifying the local address to use. PR 48930.

Modified: httpd/httpd/trunk/modules/aaa/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/config.m4?rev=1142938&r1=1142937&r2=1142938&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/aaa/config.m4 (original)
+++ httpd/httpd/trunk/modules/aaa/config.m4 Tue Jul  5 09:24:23 2011
@@ -41,7 +41,7 @@ dnl LDAP authentication module. This mod
 dnl modules in one, so as to share the LDAP server config directives.
 APACHE_MODULE(authnz_ldap, LDAP based authentication, , , no, [
   if test "$ap_has_ldap" = "1" ; then
-    MOD_AUTHNZ_LDAP_LDADD="$LDADD_ldap"
+    APR_ADDTO(MOD_AUTHNZ_LDAP_LDADD, [$LDADD_ldap])
   else
     enable_authnz_ldap=no
   fi

Modified: httpd/httpd/trunk/modules/filters/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/config.m4?rev=1142938&r1=1142937&r2=1142938&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/config.m4 (original)
+++ httpd/httpd/trunk/modules/filters/config.m4 Tue Jul  5 09:24:23 2011
@@ -73,7 +73,7 @@ APACHE_MODULE(deflate, Deflate transfer 
     AC_MSG_CHECKING([for zlib library])
     AC_TRY_LINK([#include <zlib.h>], [int i = Z_OK;], 
       [AC_MSG_RESULT(found) 
-       APR_SETVAR(MOD_DEFLATE_LDADD, [$ap_zlib_ldflags -lz])],
+       APR_ADDTO(MOD_DEFLATE_LDADD, [$ap_zlib_ldflags -lz])],
       [AC_MSG_RESULT(not found)
        enable_deflate=no
        INCLUDES=$ap_save_includes

Modified: httpd/httpd/trunk/modules/ldap/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/config.m4?rev=1142938&r1=1142937&r2=1142938&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/config.m4 (original)
+++ httpd/httpd/trunk/modules/ldap/config.m4 Tue Jul  5 09:24:23 2011
@@ -15,7 +15,7 @@ ap_ldap_url.lo dnl
 
 APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects, , no, [
   if test "$ap_has_ldap" = "1" ; then
-    MOD_LDAP_LDADD="$LDADD_ldap"
+    APR_ADDTO(MOD_LDAP_LDADD, [$LDADD_ldap])
   else
     enable_ldap=no
   fi

Modified: httpd/httpd/trunk/modules/lua/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/config.m4?rev=1142938&r1=1142937&r2=1142938&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/config.m4 (original)
+++ httpd/httpd/trunk/modules/lua/config.m4 Tue Jul  5 09:24:23 2011
@@ -137,8 +137,8 @@ lua_objects="lua_apr.lo lua_config.lo mo
 
 APACHE_MODULE(lua, Apache Lua Framework, $lua_objects, , no, [
   CHECK_LUA()
-  APR_ADDTO(INCLUDES, ["$LUA_CFLAGS"])
-  MOD_LUA_LDADD="$LUA_LIBS"
+  APR_ADDTO(INCLUDES, [$LUA_CFLAGS])
+  APR_ADDTO(MOD_LUA_LDADD, [$LUA_LIBS])
 ])
 
 APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])

Modified: httpd/httpd/trunk/modules/proxy/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/config.m4?rev=1142938&r1=1142937&r2=1142938&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/config.m4 (original)
+++ httpd/httpd/trunk/modules/proxy/config.m4 Tue Jul  5 09:24:23 2011
@@ -63,7 +63,7 @@ APACHE_MODULE(proxy_balancer, Apache pro
 APACHE_MODULE(serf, [Reverse proxy module using Serf], , , no, [
     APACHE_CHECK_SERF
     if test "$ac_cv_serf" = "yes" ; then
-      APR_SETVAR(MOD_SERF_LDADD, [\$(SERF_LIBS)])
+      APR_ADDTO(MOD_SERF_LDADD, [\$(SERF_LIBS)])
     else
       enable_serf=no
     fi

Modified: httpd/httpd/trunk/modules/ssl/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/config.m4?rev=1142938&r1=1142937&r2=1142938&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/config.m4 (original)
+++ httpd/httpd/trunk/modules/ssl/config.m4 Tue Jul  5 09:24:23 2011
@@ -45,7 +45,7 @@ ssl_util_ocsp.lo dnl
 dnl #  hook module into the Autoconf mechanism (--enable-ssl option)
 APACHE_MODULE(ssl, [SSL/TLS support (mod_ssl)], $ssl_objs, , no, [
     APACHE_CHECK_SSL_TOOLKIT
-    APR_SETVAR(MOD_SSL_LDADD, [\$(SSL_LIBS)])
+    APR_ADDTO(MOD_SSL_LDADD, [\$(SSL_LIBS)])
     CHECK_OCSP
     if test "x$enable_ssl" = "xshared"; then
        # The only symbol which needs to be exported is the module

Modified: httpd/httpd/trunk/server/mpm/event/config3.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/config3.m4?rev=1142938&r1=1142937&r2=1142938&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/config3.m4 (original)
+++ httpd/httpd/trunk/server/mpm/event/config3.m4 Tue Jul  5 09:24:23 2011
@@ -2,7 +2,7 @@ dnl ## XXX - Need a more thorough check 
 
 APACHE_CHECK_SERF
 if test "$ac_cv_serf" = yes ; then
-    APR_SETVAR(MOD_MPM_EVENT_LDADD,[\$(SERF_LIBS)])
+    APR_ADDTO(MOD_MPM_EVENT_LDADD,[\$(SERF_LIBS)])
 fi
 APACHE_SUBST(MOD_MPM_EVENT_LDADD)
 



Mime
View raw message