You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jc...@apache.org on 2017/01/06 18:21:34 UTC
svn commit: r1777683 -
/httpd/httpd/branches/trunk-test-integration/Makefile.in
Author: jchampion
Date: Fri Jan 6 18:21:34 2017
New Revision: 1777683
URL: http://svn.apache.org/viewvc?rev=1777683&view=rev
Log:
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.
Modified:
httpd/httpd/branches/trunk-test-integration/Makefile.in
Modified: httpd/httpd/branches/trunk-test-integration/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/trunk-test-integration/Makefile.in?rev=1777683&r1=1777682&r2=1777683&view=diff
==============================================================================
--- httpd/httpd/branches/trunk-test-integration/Makefile.in (original)
+++ httpd/httpd/branches/trunk-test-integration/Makefile.in Fri Jan 6 18:21:34 2017
@@ -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' \