cvs commit: apache-2.0/mpm/src Configure

1999-06-21 Thread dgaudet
dgaudet 99/06/20 16:14:18

  Modified:mpm/src  Configure
  Log:
  disable this while jim is working... no mpm/Makefile.tmpl yet
  
  Revision  ChangesPath
  1.5   +2 -1  apache-2.0/mpm/src/Configure
  
  Index: Configure
  ===
  RCS file: /home/cvs/apache-2.0/mpm/src/Configure,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Configure 1999/06/20 22:25:24 1.4
  +++ Configure 1999/06/20 23:14:17 1.5
  @@ -1594,7 +1594,8 @@
   ## Choose the right MPM method
   ## TODO:: More later
   
  -SUBDIRS=mpm/$RULE_MPM_METHOD $SUBDIRS
  +#SUBDIRS=mpm/$RULE_MPM_METHOD $SUBDIRS
  +SUBDIRS=$SUBDIRS
   
   
   ## Add in the Expat library if needed/wanted.
  
  
  


cvs commit: apache-2.0/mpm/src Configure

1999-06-20 Thread jim
jim 99/06/20 15:25:25

  Modified:mpm/src  Configure
  Log:
  Stub of the mpm/ directory of methods
  
  Revision  ChangesPath
  1.4   +18 -0 apache-2.0/mpm/src/Configure
  
  Index: Configure
  ===
  RCS file: /export/home/cvs/apache-2.0/mpm/src/Configure,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Configure 1999/06/20 21:12:48 1.3
  +++ Configure 1999/06/20 22:25:24 1.4
  @@ -227,6 +227,7 @@
   RULE_EXPAT=`./helpers/CutRule EXPAT $file`
   RULE_SHARED_CORE=`./helpers/CutRule SHARED_CORE $file`
   RULE_SHARED_CHAIN=`./helpers/CutRule SHARED_CHAIN $file`
  +RULE_MPM_METHOD=`./helpers/CutRule MPM_METHOD $file`
   
   
   ## Rule SHARED_CORE implies required DSO support
  @@ -807,6 +808,17 @@
   fi
   
   
  +## Now handle the MPM implementation. Default to 1.3 prefork
  +##
  +if [ x$RULE_MPM_METHOD = xdefault ]; then
  + if [ x$DEF_MPM_METHOD = x ]; then
  + RULE_MPM_METHOD=prefork
  + else
  + RULE_MPM_METHOD=$DEF_MPM_METHOD
  + fi
  +fi
  +
  +
   ## Now we determine the C-compiler and optimization level
   ## to use. Settings of CC and OPTIM in Configuration have
   ## the highest precedence; next comes any settings from
  @@ -1577,6 +1589,12 @@
   SUBDIRS=regex $SUBDIRS
   CFLAGS=$CFLAGS -DUSE_HSREGEX
   fi
  +
  +
  +## Choose the right MPM method
  +## TODO:: More later
  +
  +SUBDIRS=mpm/$RULE_MPM_METHOD $SUBDIRS
   
   
   ## Add in the Expat library if needed/wanted.