httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: httpd-2.0/server/mpm config.m4
Date Fri, 12 Apr 2002 03:37:01 GMT
brianp      02/04/11 20:37:01

  Modified:    .        configure.in Makefile.in
               server/mpm config.m4
  Log:
  Added support for MPMs that live in subdirectories under server/mpm
  like server/mpm/experimental/*
  
  Revision  Changes    Path
  1.215     +2 -2      httpd-2.0/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/configure.in,v
  retrieving revision 1.214
  retrieving revision 1.215
  diff -u -r1.214 -r1.215
  --- configure.in	7 Apr 2002 01:51:42 -0000	1.214
  +++ configure.in	12 Apr 2002 03:37:01 -0000	1.215
  @@ -97,9 +97,9 @@
   
   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}"
  
  
  
  1.106     +1 -1      httpd-2.0/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.in,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- Makefile.in	5 Apr 2002 19:36:06 -0000	1.105
  +++ Makefile.in	12 Apr 2002 03:37:01 -0000	1.106
  @@ -151,7 +151,7 @@
   	@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)
  
  
  
  1.43      +13 -6     httpd-2.0/server/mpm/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/config.m4,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- config.m4	28 Jan 2002 05:08:38 -0000	1.42
  +++ config.m4	12 Apr 2002 03:37:01 -0000	1.43
  @@ -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 @@
   
   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 @@
       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}"
   
  
  
  

Mime
View raw message