Bail out at configure time if an invalid MPM was specified.

Submitted by: jean-frederic clere <jfrederic.clere@fujitsu-siemens.com>
Reviewed by:  Jeff Trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92098 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 0527f520dcb74fde3a01594cf425f3bbba8fb752..a5ac206df332fde85a82dcc20c69e782107ac50a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 Changes with Apache 2.0.29-dev
+
+  *) Bail out at configure time if an invalid MPM was specified.
+     [jean-frederic clere <jfrederic.clere@fujitsu-siemens.com>]
+
   *) Prevent segv in ap_note_basic_auth_failure() when no AuthName is
      configured [John Sterling <sterling@covalent.net>]
 

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index 887bef18e1cb4e4b03d8701970e429ded939b606..8ca8ed9a08993e61e10c34129b3c96fc139f98f8 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -22,6 +22,9 @@ if test "$apache_cv_mpm" = "worker" -o "$apache_cv_mpm" = "perchild"; then
     apache_cv_mpm=prefork
   fi
 fi
+if test ! -f "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)