diff options
| author | Rainer Jung <rjung@apache.org> | 2016-02-12 17:46:38 +0000 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2016-02-12 17:46:38 +0000 |
| commit | 89605f9ee720a317602bd14c3239436d8360502d (patch) | |
| tree | 5ba560ceb943c930243686e44e9562cc4fc08515 /acinclude.m4 | |
| parent | 8dcf132975160e0ed56a1c7a5e5bb938d2bb2da9 (diff) | |
| download | httpd-89605f9ee720a317602bd14c3239436d8360502d.tar.gz | |
Use different variables to track normal
modules and MPMs during build.
Normal modules and MPMs follow different
rules in the config, e.g. we are only
allowed to have one active LoadModule
for an MPM in the config.
As a side effect, LoadModule for MPMs
will now come before LoadModule for
the normal modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1730079 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 054a83d9d1..69f28efa69 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -93,6 +93,8 @@ AC_DEFUN([APACHE_GEN_CONFIG_VARS],[ APACHE_SUBST(MK_IMPLIB) APACHE_SUBST(MKDEP) APACHE_SUBST(INSTALL_PROG_FLAGS) + APACHE_SUBST(MPM_MODULES) + APACHE_SUBST(ENABLED_MPM_MODULE) APACHE_SUBST(DSO_MODULES) APACHE_SUBST(ENABLED_DSO_MODULES) APACHE_SUBST(LOAD_ALL_MODULES) @@ -295,10 +297,10 @@ DISTCLEAN_TARGETS = modules.mk static = shared = $libname EOF - DSO_MODULES="$DSO_MODULES mpm_$1" + MPM_MODULES="$MPM_MODULES mpm_$1" # add default MPM to LoadModule list if test $1 = $default_mpm; then - ENABLED_DSO_MODULES="${ENABLED_DSO_MODULES},mpm_$1" + ENABLED_MPM_MODULE="mpm_$1" fi fi $4 |