summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2012-09-26 14:30:31 +0000
committerJim Jagielski <jim@apache.org>2012-09-26 14:30:31 +0000
commit32bf896e8f39f803b5cf85b5ee4a689a5ffcdfcb (patch)
treedfaaf6a08213d84a957738176536ff10844c7567 /configure.in
parent34090b7b27c450443ca9f069f1be926edc7c01d8 (diff)
downloadhttpd-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 'configure.in')
-rw-r--r--configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 1d65bd33c9..d3f3b4cd7a 100644
--- a/configure.in
+++ b/configure.in
@@ -630,8 +630,8 @@ if test "$enable_pie" = "yes"; then
AC_ERROR([--enable-pie requested but $CC failed using PIE flags])
fi
fi
-AC_SUBST(PICFLAGS)
-AC_SUBST(PILDFLAGS)
+APACHE_SUBST(PICFLAGS)
+APACHE_SUBST(PILDFLAGS)
prefix="$orig_prefix"
APACHE_ENABLE_MODULES