the new "mpmt" MPM is busted. the config system didn't listen to me when I

said that I really wanted --with-mpm=mpmt_pthread. I made it listen :-)

the new behavior: if you explicitly state an MPM, then it is used. if it
guesses one, then it is free to replace that guess with mpmt.

[ yes, this will probably change again when mpmt works ]

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

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index 5852ac2c2d91f5d2f7e9cd627a32815298d29d73..d09aa21e9b8f28ea3c1738f6468d642eb368fb02 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -3,6 +3,7 @@ AC_ARG_WITH(mpm,
 [  --with-mpm=MPM          Choose the process model for Apache to use.
                           MPM={dexter,mpmt_beos,mpmt_pthread,prefork,spmt_os2}],[
   APACHE_MPM=$withval
+  mpm_explicit="yes"
 ],[
   APACHE_MPM=mpmt_pthread
   case "`uname -sr`" in
@@ -11,6 +12,7 @@ AC_ARG_WITH(mpm,
     "OS/2"*)
       APACHE_MPM=spmt_os2;;
   esac 
+  mpm_explicit="no"
 ])
 AC_MSG_RESULT($APACHE_MPM)
 
@@ -34,27 +36,32 @@ APACHE_CHECK_SIGWAIT_ONE_ARG
 APACHE_FAST_OUTPUT(modules/mpm/Makefile)
 
 MPM_NAME=$apache_cv_mpm
-if test "$MPM_NAME" = "prefork" ; then
+MPM_DIR=modules/mpm/$MPM_NAME
+MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
+
+if test "$mpm_explicit" = "no"; then
+  if test "$MPM_NAME" = "prefork" ; then
     MPM_NAME="mpmt_pthread"
     EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_THREADS"
 
     ac_cv_enable_threads="no"
     AC_CACHE_SAVE
-fi
+  fi
 
-if test "$MPM_NAME" = "mpmt_pthread" ; then
+  if test "$MPM_NAME" = "mpmt_pthread" ; then
     EXTRA_CFLAGS="$EXTRA_CFLAGS -DMPMT_PTHREAD"
-elif test "$MPM_NAME" = "dexter" ; then
+  elif test "$MPM_NAME" = "dexter" ; then
     EXTRA_CFLAGS="$EXTRA_CFLAGS -DDEXTER"
-fi
+  fi
 
-if test "$MPM_NAME" = "dexter" -o "$MPM_NAME" = "mpmt_pthread"; then
+  if test "$MPM_NAME" = "dexter" -o "$MPM_NAME" = "mpmt_pthread"; then
     MPM_DIR=modules/mpm/mpmt;
     MPM_LIB=$MPM_DIR/libmpmt.la
     MPM_NAME="mpmt"
-else
+  else
     MPM_DIR=modules/mpm/$MPM_NAME
     MPM_LIB=$MPM_DIR/lib${MPM_NAME}.la
+  fi
 fi
 
 APACHE_SUBST(MPM_NAME)