diff options
| author | Jim Jagielski <jim@apache.org> | 2012-09-26 14:30:31 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2012-09-26 14:30:31 +0000 |
| commit | 32bf896e8f39f803b5cf85b5ee4a689a5ffcdfcb (patch) | |
| tree | dfaaf6a08213d84a957738176536ff10844c7567 /modules/lua | |
| parent | 34090b7b27c450443ca9f069f1be926edc7c01d8 (diff) | |
| download | httpd-32bf896e8f39f803b5cf85b5ee4a689a5ffcdfcb.tar.gz | |
backport r1385216, r1387610 from trunk:
Spin off module-specific build options into separate build vars.
[second try, supersedes r1385214]
Add MOD_CFLAGS, MOD_LDFLAGS variables etc. to the build commands,
which are available to modules for customization on a per-subdir
basis (by adding definitions to modules.mk). Reduces the risk
of side-effects when a module needs to add CFLAGS, LDFLAGS etc.
and these would be added to the global settings (ALL_CFLAGS etc.).
Adapt build settings for mod_ssl, mod_socache_dc, mod_deflate,
mod_xml2enc, mod_proxy_html, and mod_lua to use the new MOD_xxx
build variables.
Change PICFLAGS, SHLTCFLAGS and LTCFLAGS into config vars, instead
of AC_SUBSTing them in build/rules.mk.in. For support/ab, introduce
ab_CFLAGS and ab_LDFLAGS, and define explicit make targets where
they appear at the proper position in the build commands.
Consistently use "--with-xxx=PATH" in configure help strings which
are used to specify a path to the installation directory of an
auxiliary package.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1390518 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/lua')
| -rw-r--r-- | modules/lua/config.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/lua/config.m4 b/modules/lua/config.m4 index c70c5af930..d7d7c7667b 100644 --- a/modules/lua/config.m4 +++ b/modules/lua/config.m4 @@ -128,7 +128,7 @@ else AC_MSG_NOTICE([using '${LUA_LIBS}' for Lua Library]) AC_ARG_ENABLE(luajit, APACHE_HELP_STRING(--enable-luajit,Enable LuaJit Support), - APR_ADDTO(CPPFLAGS, ["-DAP_ENABLE_LUAJIT"])) + APR_ADDTO(MOD_CPPFLAGS, ["-DAP_ENABLE_LUAJIT"])) ifelse([$1], , , $1) fi ]) @@ -138,7 +138,7 @@ 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, , , [ CHECK_LUA() if test "x$enable_lua" != "xno" ; then - APR_ADDTO(INCLUDES, [$LUA_CFLAGS]) + APR_ADDTO(MOD_INCLUDES, [$LUA_CFLAGS]) APR_ADDTO(MOD_LUA_LDADD, [$LUA_LIBS]) fi ]) |