httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r836365 - /httpd/httpd/trunk/server/mpm/config2.m4
Date Sun, 15 Nov 2009 14:12:40 GMT
Author: trawick
Date: Sun Nov 15 14:12:40 2009
New Revision: 836365

URL: http://svn.apache.org/viewvc?rev=836365&view=rev
Log:
support --enable-mpms-shared (without argument) and --disable-mpms-shared

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

Modified:
    httpd/httpd/trunk/server/mpm/config2.m4

Modified: httpd/httpd/trunk/server/mpm/config2.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/config2.m4?rev=836365&r1=836364&r2=836365&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/config2.m4 (original)
+++ httpd/httpd/trunk/server/mpm/config2.m4 Sun Nov 15 14:12:40 2009
@@ -33,23 +33,31 @@
 
 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



Mime
View raw message