← Back to branch summary

~ubuntu-branches/ubuntu/hardy/apache2-mpm-itk/hardy

« back to all changes in this revision

Viewing changes to patches/03-add-mpm-to-build-system.patch

  • Committer: Bazaar Package Importer
  • Author(s): Steinar H. Gunderson
  • Date: 2007-04-25 14:13:33 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20070425141333-rnuxmwy855qa4akd
Tags: 2.2.3-04-1
* New upstream release; now with split patches in a tarball (with license
  and all) instead of one monolithic patch.
  * Adjust debian/rules accordingly.
  * Make a "source" target that uses quilt instead of manual patching.
* Remove workaround for old apache2-src.
* Drop dh_testroot from the clean target, as we do not really need root for
  it, and it's convenient to be able to just do "debian/rules source" without
  using fakeroot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/03-add-mpm-to-build-system.patch
 
1
Add the new MPM to the build system as an alternative to the other MPMs,
 
2
and mark it as experimental.
 
3
 
 
4
Index: apache2.2/server/mpm/config.m4
 
5
===================================================================
 
6
--- apache2.2.orig/server/mpm/config.m4 2007-01-29 21:30:26.000000000 +0100
 
7
+++ apache2.2/server/mpm/config.m4      2007-01-29 21:30:35.000000000 +0100
 
8
@@ -1,7 +1,7 @@
 
9
 AC_MSG_CHECKING(which MPM to use)
 
10
 AC_ARG_WITH(mpm,
 
11
 APACHE_HELP_STRING(--with-mpm=MPM,Choose the process model for Apache to use.
 
12
-                          MPM={beos|event|worker|prefork|mpmt_os2}),[
 
13
+                          MPM={beos|event|worker|prefork|mpmt_os2|itk}),[
 
14
   APACHE_MPM=$withval
 
15
 ],[
 
16
   if test "x$APACHE_MPM" = "x"; then
 
17
@@ -23,7 +23,7 @@
 
18
 
 
19
 ap_mpm_is_experimental ()
 
20
 {
 
21
-    if test "$apache_cv_mpm" = "event" ; then
 
22
+    if test "$apache_cv_mpm" = "event" -o "$apache_cv_mpm" = "itk" ; then
 
23
         return 0
 
24
     else
 
25
         return 1