diff options
| author | Kaspar Brand <kbrand@apache.org> | 2012-09-16 07:55:02 +0200 |
|---|---|---|
| committer | Kaspar Brand <kbrand@apache.org> | 2012-09-16 07:55:02 +0200 |
| commit | 3aaa0378b6be837b84cbcfdbffe13cecaa7e8446 (patch) | |
| tree | 67c396c812f33d30fec0b21864fda8d35bc810b7 /modules/cache | |
| parent | revert r1358167, in preparation of the next commit (diff) | |
| download | apache2-3aaa0378b6be837b84cbcfdbffe13cecaa7e8446.tar.xz apache2-3aaa0378b6be837b84cbcfdbffe13cecaa7e8446.zip | |
Spin off module-specific build options into separate build vars.
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/trunk@1385214 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache')
| -rw-r--r-- | modules/cache/config.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/cache/config.m4 b/modules/cache/config.m4 index 2fe41e1a36..5647e89b5b 100644 --- a/modules/cache/config.m4 +++ b/modules/cache/config.m4 @@ -42,7 +42,7 @@ if test "x$ap_distcache_configured" = "x"; then dnl Determine the distcache base directory, if any AC_MSG_CHECKING([for user-provided distcache base]) - AC_ARG_WITH(distcache, APACHE_HELP_STRING(--with-distcache=DIR, Distcache installation directory), [ + AC_ARG_WITH(distcache, APACHE_HELP_STRING(--with-distcache=PATH, Distcache installation directory), [ dnl If --with-distcache specifies a directory, we use that directory or fail if test "x$withval" != "xyes" -a "x$withval" != "x"; then dnl This ensures $withval is actually a directory and that it is absolute @@ -63,7 +63,7 @@ if test "x$ap_distcache_configured" = "x"; then if test "x$ap_distcache_base" != "x"; then APR_ADDTO(CPPFLAGS, [-I$ap_distcache_base/include]) - APR_ADDTO(INCLUDES, [-I$ap_distcache_base/include]) + APR_ADDTO(MOD_INCLUDES, [-I$ap_distcache_base/include]) APR_ADDTO(LDFLAGS, [-L$ap_distcache_base/lib]) APR_ADDTO(ap_distcache_ldflags, [-L$ap_distcache_base/lib]) if test "x$ap_platform_runtime_link_flag" != "x"; then |