diff options
| author | Jacob Champion <jchampion@apache.org> | 2017-01-06 19:21:34 +0100 |
|---|---|---|
| committer | Jacob Champion <jchampion@apache.org> | 2017-01-06 19:21:34 +0100 |
| commit | 53a469280add945f23d9ff493239da1f27a127d1 (patch) | |
| tree | 7da4b07ba84c1d56727627ac72f591184e788737 /Makefile.in | |
| parent | Enable zero-install testing (diff) | |
| download | apache2-53a469280add945f23d9ff493239da1f27a127d1.tar.xz apache2-53a469280add945f23d9ff493239da1f27a127d1.zip | |
check: enable all (non-MPM) modules when testing
We want to test everything the user builds, regardless of whether it's
enabled when first installed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777683 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/Makefile.in b/Makefile.in index 8ecee717da..6b396a45b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -364,26 +364,18 @@ check-conf: for j in $(DSO_MODULES) "^EOL^"; do \ path=$$(find "$(top_builddir)/modules" -name "mod_$$j.so"); \ if test $$j != "^EOL^"; then \ - if echo ",$(ENABLED_DSO_MODULES),"|$(EGREP) ",$$j," > /dev/null ; then \ - loading_disabled=""; \ + if test $$j = "cgid" -a "$$have_cgi" = "1"; then \ + echo "<IfModule !mpm_prefork_module>"; \ + echo " LoadModule $${j}_module $${path}"; \ + echo "</IfModule>"; \ + elif test $$j = "cgi" -a "$$have_cgid" = "1"; then \ + echo "<IfModule mpm_prefork_module>"; \ + echo " LoadModule $${j}_module $${path}"; \ + echo "</IfModule>"; \ else \ - loading_disabled="#"; \ - if test "$(LOAD_ALL_MODULES)" = "yes"; then \ - loading_disabled=""; \ - fi; \ + echo "LoadModule $${j}_module $${path}"; \ fi; \ - if test $$j = "cgid" -a "$$have_cgi" = "1"; then \ - echo "<IfModule !mpm_prefork_module>"; \ - echo " $${loading_disabled}LoadModule $${j}_module $${path}"; \ - echo "</IfModule>"; \ - elif test $$j = "cgi" -a "$$have_cgid" = "1"; then \ - echo "<IfModule mpm_prefork_module>"; \ - echo " $${loading_disabled}LoadModule $${j}_module $${path}"; \ - echo "</IfModule>"; \ - else \ - echo "$${loading_disabled}LoadModule $${j}_module $${path}"; \ fi; \ - fi; \ done; \ sed -e '1,/@@LoadModule@@/d' \ -e '/@@LoadModule@@/d' \ |