httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1142713 - in /httpd/httpd/trunk: CHANGES modules/filters/config.m4 modules/lua/config.m4
Date Mon, 04 Jul 2011 15:19:00 GMT
Author: rjung
Date: Mon Jul  4 15:19:00 2011
New Revision: 1142713

URL: http://svn.apache.org/viewvc?rev=1142713&view=rev
Log:
Respect platform specific runpath linker flag
when building mod_deflate and mod_lua.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/filters/config.m4
    httpd/httpd/trunk/modules/lua/config.m4

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1142713&r1=1142712&r2=1142713&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Jul  4 15:19:00 2011
@@ -17,6 +17,9 @@ Changes with Apache 2.3.14
   *) mod_socache_dc: use correct build variable MOD_SOCACHE_DC_LDADD
      instead of MOD_SOCACHE_LDADD in build macro. [Rainer Jung]
 
+  *) mod_lua, mod_deflate: respect platform specific runpath linker
+     flag. [Rainer Jung]
+
 Changes with Apache 2.3.13
 
   *) ab: Support specifying the local address to use. PR 48930.

Modified: httpd/httpd/trunk/modules/filters/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/config.m4?rev=1142713&r1=1142712&r2=1142713&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/config.m4 (original)
+++ httpd/httpd/trunk/modules/filters/config.m4 Mon Jul  4 15:19:00 2011
@@ -56,20 +56,23 @@ APACHE_MODULE(deflate, Deflate transfer 
     ap_save_includes=$INCLUDES
     ap_save_ldflags=$LDFLAGS
     ap_save_cppflags=$CPPFLAGS
+    ap_zlib_ldflags=""
     if test "$ap_zlib_base" != "/usr"; then
       APR_ADDTO(INCLUDES, [-I${ap_zlib_base}/include])
       dnl put in CPPFLAGS temporarily so that AC_TRY_LINK below will work
       CPPFLAGS="$CPPFLAGS $INCLUDES"
       APR_ADDTO(LDFLAGS, [-L${ap_zlib_base}/lib])
+      APR_ADDTO(ap_zlib_ldflags, [-L${ap_zlib_base}/lib])
       if test "x$ap_platform_runtime_link_flag" != "x"; then
          APR_ADDTO(LDFLAGS, [$ap_platform_runtime_link_flag${ap_zlib_base}/lib])
+         APR_ADDTO(ap_zlib_ldflags, [$ap_platform_runtime_link_flag${ap_zlib_base}/lib])
       fi
     fi
     APR_ADDTO(LIBS, [-lz])
     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, [-lz])],
+     APR_SETVAR(MOD_DEFLATE_LDADD, [$ap_zlib_ldflags -lz])],
     [AC_MSG_RESULT(not found)
      enable_deflate=no
      INCLUDES=$ap_save_includes

Modified: httpd/httpd/trunk/modules/lua/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/config.m4?rev=1142713&r1=1142712&r2=1142713&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/lua/config.m4 (original)
+++ httpd/httpd/trunk/modules/lua/config.m4 Mon Jul  4 15:19:00 2011
@@ -57,6 +57,9 @@ for x in $test_paths ; do
         LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
         AC_CHECK_LIB(lua5.1, luaL_newstate, [
             LUA_LIBS="-L$x/lib -llua5.1 $lib_m"
+            if test "x$ap_platform_runtime_link_flag" != "x"; then
+               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib])
+            fi
             LUA_CFLAGS="-I$x/include/lua5.1"
             ])
         CFLAGS=$save_CFLAGS
@@ -74,6 +77,9 @@ for x in $test_paths ; do
         LDFLAGS="-L$x/lib/lua51 $LDFLAGS $lib_m"
         AC_CHECK_LIB(lua, luaL_newstate, [
             LUA_LIBS="-L$x/lib/lua51 -llua $lib_m"
+            if test "x$ap_platform_runtime_link_flag" != "x"; then
+               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib/lua51])
+            fi
             LUA_CFLAGS="-I$x/include/lua51"
             ])
         CFLAGS=$save_CFLAGS
@@ -91,6 +97,9 @@ for x in $test_paths ; do
         LDFLAGS="-L$x/lib $LDFLAGS $lib_m"
         AC_CHECK_LIB(lua, luaL_newstate, [
             LUA_LIBS="-L$x/lib -llua $lib_m"
+            if test "x$ap_platform_runtime_link_flag" != "x"; then
+               APR_ADDTO(LUA_LIBS, [$ap_platform_runtime_link_flag$x/lib])
+            fi
             LUA_CFLAGS="-I$x/include"
             ])
         CFLAGS=$save_CFLAGS



Mime
View raw message