From: Jeff Trawick <trawick@apache.org>
Date: Sun, 15 Nov 2009 14:12:40 +0000 (+0000)
Subject: support --enable-mpms-shared (without argument) and --disable-mpms-shared
X-Git-Tag: 2.3.4~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4789760fc7ecf5b5f564841faee922ac758fd738;p=apache

support --enable-mpms-shared (without argument) and --disable-mpms-shared

the former builds just the default MPM (or --with-mpm argument)


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

diff --git a/server/mpm/config2.m4 b/server/mpm/config2.m4
index 76a04e4a7b..3482d3f414 100644
--- a/server/mpm/config2.m4
+++ b/server/mpm/config2.m4
@@ -33,23 +33,31 @@ APACHE_MPM_ENABLED($default_mpm)
 
 AC_ARG_ENABLE(mpms-shared,
 APACHE_HELP_STRING(--enable-mpms-shared=MPM-LIST,Space-separated list of MPM modules to enable for dynamic loading.  MPM-LIST=list | "all"),[
-    mpm_build=shared
-    for i in $enableval; do
-        if test "$i" = "all"; then
-            for j in $ap_supported_shared_mpms; do
-                eval "enable_mpm_$j=shared"
-                APACHE_MPM_ENABLED($j)
-            done
-        else
-            i=`echo $i | sed 's/-/_/g'`
-            if ap_mpm_supports_shared $i; then
-                eval "enable_mpm_$i=shared"
-                APACHE_MPM_ENABLED($i)
+    if test "$enableval" = "no"; then
+        mpm_build=static
+    else
+        mpm_build=shared
+dnl     Build just the default MPM if --enable-mpms-shared has no argument.
+        if test "$enableval" = "yes"; then
+            enableval=$default_mpm
+        fi
+        for i in $enableval; do
+            if test "$i" = "all"; then
+                for j in $ap_supported_shared_mpms; do
+                    eval "enable_mpm_$j=shared"
+                    APACHE_MPM_ENABLED($j)
+                done
             else
-                AC_MSG_ERROR([MPM $i does not support dynamic loading.])
+                i=`echo $i | sed 's/-/_/g'`
+                if ap_mpm_supports_shared $i; then
+                    eval "enable_mpm_$i=shared"
+                    APACHE_MPM_ENABLED($i)
+                else
+                    AC_MSG_ERROR([MPM $i does not support dynamic loading.])
+                fi
             fi
-        fi
-    done
+        done
+    fi
 ], [mpm_build=static])
 
 for i in $ap_enabled_mpms; do