Commit 231256db authored by Rainer Jung's avatar Rainer Jung
Browse files

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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142938 13f79535-47bb-0310-9956-ffa450edef68
parent aa55d11d

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -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.

modules/aaa/config.m4

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 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, [

  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

modules/filters/config.m4

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [ 
    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

modules/ldap/config.m4

+1 −1
Original line number Diff line number Diff line
@@ -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

modules/lua/config.m4

+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ lua_objects="lua_apr.lo lua_config.lo mod_lua.lo lua_request.lo lua_vmprep.lo" 


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])