diff options
| author | Jim Jagielski <jim@apache.org> | 2017-09-19 10:15:00 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2017-09-19 10:15:00 +0000 |
| commit | 86d3b19a8e5b97d3d1013f338451d5bb741b418d (patch) | |
| tree | d7faf3c4735d0857cda23fbb0c0f20f63c4dbb33 /Makefile.in | |
| parent | fde15ad27b1971f6fe3a847285d1e4a0465c2d5d (diff) | |
| download | httpd-86d3b19a8e5b97d3d1013f338451d5bb741b418d.tar.gz | |
Merge r1729235, r1730079, r1801665 from trunk:
Exclude MPM modules from automatic LoadModule
enabling when configure was called with
-enable-load-all-modules. The default MPM
should still get enabled automatically.
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.
Makefile.in: fix MPM_MODULES typo
Submitted by: rjung, jchampion
Reviewed by: jchampion, icing, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1808854 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in index 6d952b24a1..6ded87eb0b 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_MODULES)$(DSO_MODULES)" = "x"; then \ sed -e 's#@@ServerRoot@@#$(prefix)#g' \ -e 's#@@Port@@#$(PORT)#g' \ -e 's#@@SSLPort@@#$(SSLPORT)#g' \ @@ -68,28 +68,38 @@ install-conf: else \ have_cgid="0"; \ fi; \ - for j in $(DSO_MODULES) "^EOL^"; do \ + for j in $(MPM_MODULES) "^EOL^"; do \ if test $$j != "^EOL^"; then \ - if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \ + if echo ",$(ENABLED_MPM_MODULE),"|$(EGREP) ",$$j," > /dev/null ; then \ loading_disabled=""; \ else \ loading_disabled="#"; \ fi; \ - if test "$(LOAD_ALL_MODULES)" = "yes"; then \ + 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="#"; \ + 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' \ |