From: Greg Stein <gstein@apache.org>
Date: Thu, 2 Nov 2000 03:30:36 +0000 (+0000)
Subject: Simplify the configuration mechanisms for threading in APR.
X-Git-Tag: APACHE_2_0_ALPHA_8~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a55dfa4e756141e047859650d5d1dbf2f560518b;p=apache

Simplify the configuration mechanisms for threading in APR.
Revise how Apache configs APR and allow MPMs (or other config scripts) to
    pass cmd line params down to APR. For the MPMs that specifically require
    or disallow threads, have them force APR threads on/off.

Submitted by: Joe Orton <joe@light.plus.com>
Reviewed by: Greg Stein


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

diff --git a/configure.in b/configure.in
index bc559a1559..716bdf4f76 100644
--- a/configure.in
+++ b/configure.in
@@ -205,7 +205,7 @@ dnl ## or disable threads), while still allowing APR to run and generate
 dnl ## APRVARS before Apache generates it's Makefiles and the related files.
 dnl ## This allows APR to detect libraries like dl and tell Apache that it
 dnl ## needs to include or not include them.
-RUN_SUBDIR_CONFIG_NOW(lib/apr)
+RUN_SUBDIR_CONFIG_NOW(lib/apr, $apache_apr_flags)
 RUN_SUBDIR_CONFIG_NOW(lib/pcre)
 . ./lib/apr/APRVARS
 
diff --git a/server/mpm/beos/config.m4 b/server/mpm/beos/config.m4
index 80def68ec4..faf3e92a9d 100644
--- a/server/mpm/beos/config.m4
+++ b/server/mpm/beos/config.m4
@@ -1,8 +1,7 @@
 dnl ## XXX - Need a more thorough check of the proper flags to use
 
 if test "$MPM_NAME" = "beos" ; then
-    ac_cv_enable_threads="yes"
-    AC_CACHE_SAVE
+    apache_apr_flags="--enable-threads"
 
     APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
 fi
diff --git a/server/mpm/dexter/config.m4 b/server/mpm/dexter/config.m4
index 41afb59b3c..db864c3a70 100644
--- a/server/mpm/dexter/config.m4
+++ b/server/mpm/dexter/config.m4
@@ -1,8 +1,7 @@
 dnl ## XXX - Need a more thorough check of the proper flags to use
 
 if test "$MPM_NAME" = "dexter" ; then
-    ac_cv_enable_threads="yes"
-    AC_CACHE_SAVE
+    apache_apr_flags="--enable-threads"
 
     APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
     APACHE_MPM_PTHREAD
diff --git a/server/mpm/mpmt_beos/config.m4 b/server/mpm/mpmt_beos/config.m4
index c71adcb40c..a6cf319d39 100644
--- a/server/mpm/mpmt_beos/config.m4
+++ b/server/mpm/mpmt_beos/config.m4
@@ -1,8 +1,7 @@
 dnl ## XXX - Need a more thorough check of the proper flags to use
 
 if test "$MPM_NAME" = "mpmt_beos" ; then
-    ac_cv_enable_threads="yes"
-    AC_CACHE_SAVE
+    apache_apr_flags="--enable-threads"
 
     APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
 fi
diff --git a/server/mpm/mpmt_pthread/config.m4 b/server/mpm/mpmt_pthread/config.m4
index 343a265a8f..9f79f6f6df 100644
--- a/server/mpm/mpmt_pthread/config.m4
+++ b/server/mpm/mpmt_pthread/config.m4
@@ -1,8 +1,7 @@
 dnl ## XXX - Need a more thorough check of the proper flags to use
 
 if test "$MPM_NAME" = "mpmt_pthread" ; then
-    ac_cv_enable_threads="yes"
-    AC_CACHE_SAVE
+    apache_apr_flags="--enable-threads"
 
     APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
 
diff --git a/server/mpm/perchild/config.m4 b/server/mpm/perchild/config.m4
index 2f3bf00f1d..80192bd2f0 100644
--- a/server/mpm/perchild/config.m4
+++ b/server/mpm/perchild/config.m4
@@ -1,8 +1,7 @@
 dnl ## XXX - Need a more thorough check of the proper flags to use
 
 if test "$MPM_NAME" = "perchild" ; then
-    ac_cv_enable_threads="yes"
-    AC_CACHE_SAVE
+    apache_apr_flags="--enable-threads"
 
     APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)
     APACHE_MPM_PTHREAD
diff --git a/server/mpm/prefork/config.m4 b/server/mpm/prefork/config.m4
index be49ffb977..e6b2fcdfed 100644
--- a/server/mpm/prefork/config.m4
+++ b/server/mpm/prefork/config.m4
@@ -1,7 +1,6 @@
 if test "$MPM_NAME" = "prefork" ; then
 dnl Turn off all threading functions in APR
-    ac_cv_enable_threads="no"
-    AC_CACHE_SAVE
+    apache_apr_flags="--disable-threads"
 
     APACHE_FAST_OUTPUT(modules/mpm/$MPM_NAME/Makefile)