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

diff --git a/Makefile.in b/Makefile.in
index 8ecee717da6846fd389793fbe3c2cc386f60839c..6b396a45b770b73ce18a95f6b1336391f07ed418 100644 (file)
--- 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' \