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 bc559a1559ce6504761cad0cb66ad0e2049f11ef..716bdf4f761b6a59a5fe2233f985ddb654d2b3e4 100644 (file)
--- 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 80def68ec42f88b3668a4de3b6e72b4e8a5f0dbc..faf3e92a9d354d401939f5bc73d1220a0bd3d7a5 100644 (file)
--- 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 41afb59b3c93fabe64085a8ac17b025bbacc245e..db864c3a709437018151dc85099fa2302e47028e 100644 (file)
--- 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 c71adcb40c831e8a9dad9e56f73434358b052a43..a6cf319d39a383884d60c90a02cd84ba21f476eb 100644 (file)
--- 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 343a265a8fec860b90a63f1e885338bdb4d7215c..9f79f6f6df72ae294466ce1090362e5605469385 100644 (file)
--- 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 2f3bf00f1d78412d44ba67bdfed7912737da8290..80192bd2f06d2da0f37baf9f75ba227802d71c08 100644 (file)
--- 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 be49ffb977c4cd4d90174279948d5787f6f6de04..e6b2fcdfedb132f2ba91d3c20c5481e6385e0da9 100644 (file)
--- 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)