Don't disable threads just because we are using the prefork MPM.

If somebody wants to compile without threads, they must now add
--disable-threads to the configure command line.  [Ryan Bloom]

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

diff --git a/CHANGES b/CHANGES
index bd90971b998f5140c2dda23ca259ac9f088e33eb..5a34430ca0620171baeb2144c5c6388d196bf24a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0b1
 
+  *) Don't disable threads just because we are using the prefork MPM.
+     If somebody wants to compile without threads, they must now add
+     --disable-threads to the configure command line.  [Ryan Bloom]
+
   *) Begin to move the calls to update_child_status into common code, so
      that each individual MPM does not need to update the scoreboard itself.
      [Ryan Bloom]

diff --git a/server/mpm/prefork/config.m4 b/server/mpm/prefork/config.m4
index 30093874d12b6e510bc839221efcac4ab651ffcb..9c189a8642942145500637d099a6cce87fd896a7 100644 (file)
--- a/server/mpm/prefork/config.m4
+++ b/server/mpm/prefork/config.m4
@@ -1,7 +1,3 @@
 if test "$MPM_NAME" = "prefork" ; then
-dnl Turn off all threading functions in APR
-    apache_apr_flags="--disable-threads"
-
     APACHE_FAST_OUTPUT(server/mpm/$MPM_NAME/Makefile)
-
 fi