diff options
| author | Rainer Jung <rjung@apache.org> | 2016-02-12 18:46:38 +0100 |
|---|---|---|
| committer | Rainer Jung <rjung@apache.org> | 2016-02-12 18:46:38 +0100 |
| commit | 89605f9ee720a317602bd14c3239436d8360502d (patch) | |
| tree | 5ba560ceb943c930243686e44e9562cc4fc08515 /Makefile.in | |
| parent | Official ASF favicon (diff) | |
| download | apache2-89605f9ee720a317602bd14c3239436d8360502d.tar.xz apache2-89605f9ee720a317602bd14c3239436d8360502d.zip | |
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 'Makefile.in')
| -rw-r--r-- | Makefile.in | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index 755d0b2969..b166700b6f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -45,7 +45,7 @@ install-conf: if [ -f $$i ] ; then \ ( \ n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \ - if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \ + if test $$n_lm -eq 0 -o "x$(MPM_MODULE)$(DSO_MODULES)" = "x"; then \ sed -e 's#@@ServerRoot@@#$(prefix)#g' \ -e 's#@@Port@@#$(PORT)#g' \ -e 's#@@SSLPort@@#$(SSLPORT)#g' \ @@ -68,29 +68,38 @@ install-conf: else \ have_cgid="0"; \ fi; \ + for j in $(MPM_MODULES) "^EOL^"; do \ + if test $$j != "^EOL^"; then \ + if echo ",$(ENABLED_MPM_MODULE),"|$(EGREP) ",$$j," > /dev/null ; then \ + loading_disabled=""; \ + else \ + loading_disabled="#"; \ + fi; \ + echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ + fi; \ + done; \ for j in $(DSO_MODULES) "^EOL^"; do \ if test $$j != "^EOL^"; then \ if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \ loading_disabled=""; \ else \ loading_disabled="#"; \ - mpm=`echo $$j|sed s/_.*//`; \ - if test "$(LOAD_ALL_MODULES)" = "yes" -a "$$mpm" != "mpm"; then \ + if test "$(LOAD_ALL_MODULES)" = "yes"; then \ loading_disabled=""; \ fi; \ fi; \ - if test $$j = "cgid" -a "$$have_cgi" = "1"; then \ - echo "<IfModule !mpm_prefork_module>"; \ - echo " $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ - echo "</IfModule>"; \ - elif test $$j = "cgi" -a "$$have_cgid" = "1"; then \ - echo "<IfModule mpm_prefork_module>"; \ - echo " $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ - echo "</IfModule>"; \ - else \ - echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ - fi; \ + if test $$j = "cgid" -a "$$have_cgi" = "1"; then \ + echo "<IfModule !mpm_prefork_module>"; \ + echo " $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ + echo "</IfModule>"; \ + elif test $$j = "cgi" -a "$$have_cgid" = "1"; then \ + echo "<IfModule mpm_prefork_module>"; \ + echo " $${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ + echo "</IfModule>"; \ + else \ + echo "$${loading_disabled}LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \ fi; \ + fi; \ done; \ sed -e '1,/@@LoadModule@@/d' \ -e '/@@LoadModule@@/d' \ |