Added support for MPMs that live in subdirectories under server/mpm

like server/mpm/experimental/*

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

diff --git a/Makefile.in b/Makefile.in
index 88220cf2efc5a2c280bdfc9e2a7cc0f3fb59a44d..bacd4330f554a4fac298dc910137dd691e639ba2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -151,7 +151,7 @@ install-include:
        @if test -f $(srcdir)/os/$(OS_DIR)/os-inline.c; then \
             cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(includedir); \
         fi;
-       @cp -p $(srcdir)/server/mpm/$(MPM_NAME)/*.h $(includedir)
+       @cp -p $(srcdir)/server/mpm/$(MPM_SUBDIR_NAME)/*.h $(includedir)
        @cp -p $(srcdir)/modules/dav/main/mod_dav.h $(includedir)
        @cp -p $(srcdir)/modules/filters/mod_include.h $(includedir)
        @cp -p $(srcdir)/modules/generators/mod_cgi.h $(includedir)

diff --git a/configure.in b/configure.in
index a8713cdff5fec7baac7f67038b2e6d8f6ea4d917..8d40221cf07097d440813ecc3e44f349bb75f6f5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -97,9 +97,9 @@ dnl then we are running in VPATH mode.
 
 if test "$abs_builddir" != "$abs_srcdir"; then
   USE_VPATH=1
-  APR_ADDTO(INCLUDES, [-I. -I\$(srcdir) -I\$(top_builddir)/os/\$(OS_DIR) -I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_builddir)/server/mpm/\$(MPM_NAME) -I\$(top_srcdir)/server/mpm/\$(MPM_NAME) -I\$(top_builddir)/modules/http -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/proxy -I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_builddir)/srclib/apr/include -I\$(top_srcdir)/srclib/apr/include -I\$(top_builddir)/srclib/apr-util/include -I\$(top_srcdir)/srclib/apr-util/include])
+  APR_ADDTO(INCLUDES, [-I. -I\$(srcdir) -I\$(top_builddir)/os/\$(OS_DIR) -I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_builddir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_builddir)/modules/http -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/proxy -I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_builddir)/srclib/apr/include -I\$(top_srcdir)/srclib/apr/include -I\$(top_builddir)/srclib/apr-util/include -I\$(top_srcdir)/srclib/apr-util/include])
 else
-  APR_ADDTO(INCLUDES, [-I. -I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/srclib/apr/include -I\$(top_srcdir)/srclib/apr-util/include])
+  APR_ADDTO(INCLUDES, [-I. -I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/srclib/apr/include -I\$(top_srcdir)/srclib/apr-util/include])
 fi
 
 echo $ac_n "${nl}Applying OS-specific hints for httpd ...${nl}"

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index e0f4c0b506bbbb454f28deca5ea6e86f128929f2..aae3afab046c7ce1dbd3ebef875fa1f35e1cf18b 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -1,7 +1,7 @@
 AC_MSG_CHECKING(which MPM to use)
 AC_ARG_WITH(mpm,
 APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use.
-                          MPM={beos|worker|prefork|mpmt_os2|perchild}),[
+                          MPM={beos|worker|prefork|mpmt_os2|perchild|leader}),[
   APACHE_MPM=$withval
 ],[
   if test "x$APACHE_MPM" = "x"; then
@@ -12,7 +12,7 @@ AC_MSG_RESULT($APACHE_MPM)
 
 apache_cv_mpm=$APACHE_MPM
        
-if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild"; then
+if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild" -o "$apache_cv_mpm" = "leader"; then
   APR_CHECK_APR_DEFINE(APR_HAS_THREADS, srclib/apr)
 
   if test "x$ac_cv_define_APR_HAS_THREADS" = "xno"; then
@@ -22,16 +22,23 @@ if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild"; then
     apache_cv_mpm=prefork
   fi
 fi
-if test ! -f "$abs_srcdir/server/mpm/$apache_cv_mpm/mpm.h"; then
-    AC_MSG_ERROR(the selected mpm -- $apache_cv_mpm -- is not supported)
-fi
 
 APACHE_FAST_OUTPUT(server/mpm/Makefile)
 
 MPM_NAME=$apache_cv_mpm
-MPM_DIR=server/mpm/$MPM_NAME
+if test "$MPM_NAME" = "leader"; then
+  MPM_SUBDIR_NAME=experimental/$MPM_NAME
+else
+  MPM_SUBDIR_NAME=$MPM_NAME
+fi
+MPM_DIR=server/mpm/$MPM_SUBDIR_NAME
 MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
 
+if test ! -f "$abs_srcdir/$MPM_DIR/mpm.h"; then
+    AC_MSG_ERROR(the selected mpm -- $apache_cv_mpm -- is not supported)
+fi
+
 APACHE_SUBST(MPM_NAME)
+APACHE_SUBST(MPM_SUBDIR_NAME)
 MODLIST="$MODLIST mpm_${MPM_NAME}"