/[apache]/trunk/dist/2.0/patches/22_all_itk_20070425-00.patch
Gentoo

Diff of /trunk/dist/2.0/patches/22_all_itk_20070425-00.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 143 Revision 144
12+++ b/server/mpm/config.m4 12+++ b/server/mpm/config.m4
13@@ -1,7 +1,7 @@ 13@@ -1,7 +1,7 @@
14 AC_MSG_CHECKING(which MPM to use) 14 AC_MSG_CHECKING(which MPM to use)
15 AC_ARG_WITH(mpm, 15 AC_ARG_WITH(mpm,
16 APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use. 16 APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use.
17- MPM={beos|worker|prefork|mpmt_os2|perchild|peruser|leader|threadpool}),[ 17- MPM={beos|worker|prefork|mpmt_os2|perchild|leader|threadpool}),[
18+ MPM={beos|worker|prefork|mpmt_os2|perchild|peruser|leader|threadpool,itk}),[ 18+ MPM={beos|worker|prefork|mpmt_os2|perchild|leader|threadpool|itk}),[
19 APACHE_MPM=$withval 19 APACHE_MPM=$withval
20 ],[ 20 ],[
21 if test "x$APACHE_MPM" = "x"; then 21 if test "x$APACHE_MPM" = "x"; then
22@@ -26,12 +26,17 @@ fi 22@@ -26,12 +26,17 @@ fi
23 APACHE_FAST_OUTPUT(server/mpm/Makefile) 23 APACHE_FAST_OUTPUT(server/mpm/Makefile)
24 24
25 MPM_NAME=$apache_cv_mpm 25 MPM_NAME=$apache_cv_mpm
26-if test "$MPM_NAME" = "leader" -o "$MPM_NAME" = "threadpool" -o "$MPM_NAME" = "perchild"; then
26-if test "$MPM_NAME" = "leader" -o "$MPM_NAME" = "threadpool" -o "$MPM_NAME" = "perchild" -o "$MPM_NAME" = "peruser"; then 27+if test "$MPM_NAME" = "leader" -o "$MPM_NAME" = "threadpool" -o "$MPM_NAME" = "perchild" -o "$MPM_NAME" = "itk"; then
27+if test "$MPM_NAME" = "leader" -o "$MPM_NAME" = "threadpool" -o "$MPM_NAME" = "perchild" -o "$MPM_NAME" = "peruser" -o "$MPM_NAME" = "itk"; then
28 AC_MSG_WARN(You have selected an EXPERIMENTAL MPM. Be warned!) 28 AC_MSG_WARN(You have selected an EXPERIMENTAL MPM. Be warned!)
29 MPM_SUBDIR_NAME=experimental/$MPM_NAME 29 MPM_SUBDIR_NAME=experimental/$MPM_NAME
30 else 30 else
31 MPM_SUBDIR_NAME=$MPM_NAME 31 MPM_SUBDIR_NAME=$MPM_NAME
32 fi 32 fi

Legend:
Removed from v.143  
changed lines
  Added in v.144

  ViewVC Help
Powered by ViewVC 1.1.20