Commit cb9053e2 authored by Jacob Champion's avatar Jacob Champion
Browse files

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
parent 025feecc

Makefile.in

+9 −17
Original line number Diff line number Diff line
@@ -364,24 +364,16 @@ 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=""; \

	                        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 $${path}"; \

	                            echo "	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 "	LoadModule $${j}_module $${path}"; \

	                            echo "</IfModule>"; \

	                        else \

	                        echo "$${loading_disabled}LoadModule $${j}_module $${path}"; \

	                            echo "LoadModule $${j}_module $${path}"; \

	                        fi; \

	                    fi; \

	                done; \