httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gst...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm config.m4
Date Sat, 08 Jul 2000 13:05:41 GMT
gstein      00/07/08 06:05:41

  Modified:    src/modules/mpm config.m4
  Log:
  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 ]
  
  Revision  Changes    Path
  1.19      +14 -7     apache-2.0/src/modules/mpm/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- config.m4	2000/07/07 17:35:41	1.18
  +++ config.m4	2000/07/08 13:05:40	1.19
  @@ -3,6 +3,7 @@
   [  --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 @@
       "OS/2"*)
         APACHE_MPM=spmt_os2;;
     esac 
  +  mpm_explicit="no"
   ])
   AC_MSG_RESULT($APACHE_MPM)
   
  @@ -34,27 +36,32 @@
   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)
  
  
  

Mime
View raw message