svn commit: r832621 - in /httpd/httpd/trunk/server/mpm: config.m4 config2.m4

[tr...@apache.org]

Author: trawick
Date: Tue Nov  3 23:51:20 2009
New Revision: 832621

URL: http://svn.apache.org/viewvc?rev=832621&view=rev
Log:
respect the MPM's indication passed on APACHE_MPM_SUPPORTED() of whether
or not it can run as a shared library

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

Modified: httpd/httpd/trunk/server/mpm/config.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/config.m4?rev=832621&r1=832620&r2=832621&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/config.m4 (original)
+++ httpd/httpd/trunk/server/mpm/config.m4 Tue Nov  3 23:51:20 2009
@@ -42,6 +42,9 @@
 dnl APACHE_MPM_SUPPORTED(name, supports-shared, is_threaded)
 AC_DEFUN(APACHE_MPM_SUPPORTED,[
     SUPPORTED_MPMS="$SUPPORTED_MPMS $1 "
+    if test "$2" = "yes"; then
+        SHARED_MPMS="$SHARED_MPMS $1 "
+    fi
     if test "$3" = "yes"; then
         THREADED_MPMS="$THREADED_MPMS $1 "
     fi
@@ -65,6 +68,15 @@
     fi
 }
 
+ap_mpm_supports_shared ()
+{
+    if echo "$SHARED_MPMS" | grep " $1 " >/dev/null; then
+        return 0
+    else
+        return 1
+    fi
+}
+
 ap_mpm_is_threaded ()
 {
     if test "$mpm_build" = "shared" -a ac_cv_define_APR_HAS_THREADS = "yes"; then

Modified: httpd/httpd/trunk/server/mpm/config2.m4
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/config2.m4?rev=832621&r1=832620&r2=832621&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/config2.m4 (original)
+++ httpd/httpd/trunk/server/mpm/config2.m4 Tue Nov  3 23:51:20 2009
@@ -36,14 +36,18 @@
     mpm_build=shared
     for i in $enableval; do
         if test "$i" = "all"; then
-            for j in $SUPPORTED_MPMS; do
+            for j in $SHARED_MPMS; do
                 eval "enable_mpm_$j=shared"
                 APACHE_MPM_ENABLED($j)
             done
         else
             i=`echo $i | sed 's/-/_/g'`
-            eval "enable_mpm_$i=shared"
-            APACHE_MPM_ENABLED($i)
+            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
     done
 ], [mpm_build=static])