httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm config.m4
Date Wed, 23 Aug 2000 20:16:30 GMT
jim         00/08/23 13:16:29

  Modified:    src      CHANGES
               src/lib/apr hints.m4
               src/modules/mpm config.m4
  Log:
  Try to organize the MPM pre-selection to the hints.m4 file.
  
  Revision  Changes    Path
  1.213     +4 -0      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.212
  retrieving revision 1.213
  diff -u -r1.212 -r1.213
  --- CHANGES	2000/08/23 00:01:51	1.212
  +++ CHANGES	2000/08/23 20:16:20	1.213
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0a7
   
  +  *) Migrate the pre-selection of which MPM to use for specific
  +     platforms to hints.m4, which contains (or should contain)
  +     all platform specific "hints". [Jim Jagielski]
  +
     *) Remove IOLs from Apache.  With filtering, IOLs are no longer necessary
        [Ryan Bloom]
   
  
  
  
  1.16      +12 -0     apache-2.0/src/lib/apr/hints.m4
  
  Index: hints.m4
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/hints.m4,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- hints.m4	2000/08/22 21:20:11	1.15
  +++ hints.m4	2000/08/23 20:16:27	1.16
  @@ -42,6 +42,15 @@
   ])
   
   dnl
  +dnl APR_SETVAR(variable, value)
  +dnl
  +dnl  Set variable no matter what
  +dnl
  +AC_DEFUN(APR_SETVAR,[
  +  $1="$2"; export $1
  +])
  +
  +dnl
   dnl APR_ADDTO(variable, value)
   dnl
   dnl  Add value to variable
  @@ -76,6 +85,7 @@
   	APR_SETIFNULL(CFLAGS, [-DAUX3 -D_POSIX_SOURCE])
   	APR_SETIFNULL(LIBS, [-lposix -lbsd])
   	APR_SETIFNULL(LDFLAGS, [-s])
  +	APR_SETVAR(APACHE_MPM, [prefork])
   	;;
       *-ibm-aix*)
           case $PLAT in
  @@ -131,6 +141,7 @@
       *os2_emx*)
   	APR_SETIFNULL(SHELL, [sh])
           APR_SETIFNULL(file_as_socket, [0])
  +        APR_SETVAR(APACHE_MPM, [spmt_os2])
   	;;
       *-hi-hiux)
   	APR_SETIFNULL(CFLAGS, [-DHIUX])
  @@ -365,6 +376,7 @@
       *beos*)
   	APR_SETIFNULL(CFLAGS, [-DBEOS])
   	APR_SETIFNULL(file_as_socket, [0])
  +	APR_SETVAR(APACHE_MPM, [mpmt_beos])
   	PLATOSVERS=`uname -r`
   	case $PLATOSVERS in
   		5.1)
  
  
  
  1.27      +3 -9      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.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- config.m4	2000/07/27 00:16:31	1.26
  +++ config.m4	2000/08/23 20:16:29	1.27
  @@ -4,15 +4,9 @@
                  MPM={dexter,mpmt_beos,mpmt_pthread,prefork,spmt_os2,perchild}],[
     APACHE_MPM=$withval
   ],[
  -  APACHE_MPM=mpmt_pthread
  -  PLAT=`$ac_config_guess`
  -  PLAT=`$ac_config_sub $PLAT`
  -  case "$PLAT" in
  -    *beos*)
  -      APACHE_MPM=mpmt_beos;;
  -    *os2_emx*)
  -      APACHE_MPM=spmt_os2;;
  -  esac 
  +  if test "x$APACHE_MPM" = "x"; then
  +    APACHE_MPM=mpmt_pthread
  +  fi
   ])
   AC_MSG_RESULT($APACHE_MPM)
   
  
  
  

Mime
View raw message