From: Rainer Jung <rjung@apache.org>
Date: Mon, 8 Feb 2016 19:45:17 +0000 (+0000)
Subject: Exclude MPM modules from automatic LoadModule
X-Git-Tag: 2.5.0-alpha~2170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e6331e402941c193c28ea5eab2a00fce249beb9;p=thirdparty%2Fapache%2Fhttpd.git

Exclude MPM modules from automatic LoadModule
enabling when configure was called with
-enable-load-all-modules. The default MPM
should still get enabled automatically.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1729235 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/Makefile.in b/Makefile.in
index 29f1ab718bc..755d0b29691 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,9 +74,10 @@ install-conf:
 	    						loading_disabled=""; \
 	    					else \
 	    						loading_disabled="#"; \
-	    					fi; \
-	    					if test "$(LOAD_ALL_MODULES)" = "yes"; then \
-	    						loading_disabled=""; \
+	    						mpm=`echo $$j|sed s/_.*//`; \
+		    					if test "$(LOAD_ALL_MODULES)" = "yes" -a "$$mpm" != "mpm"; then \
+		    						loading_disabled=""; \
+	    						fi; \
 	    					fi; \
 							if test $$j = "cgid" -a "$$have_cgi" = "1"; then \
 								echo "<IfModule !mpm_prefork_module>"; \