diff options
| author | Greg Stein <gstein@apache.org> | 2000-11-02 04:30:36 +0100 |
|---|---|---|
| committer | Greg Stein <gstein@apache.org> | 2000-11-02 04:30:36 +0100 |
| commit | a55dfa4e756141e047859650d5d1dbf2f560518b (patch) | |
| tree | 7882c28da01670942cd0565599902e1c852b58b5 /server/mpm | |
| parent | Get rid of some warnings on Solaris 8 by using APR's ctype macros: (diff) | |
| download | apache2-a55dfa4e756141e047859650d5d1dbf2f560518b.tar.xz apache2-a55dfa4e756141e047859650d5d1dbf2f560518b.zip | |
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
Diffstat (limited to 'server/mpm')
| -rw-r--r-- | server/mpm/beos/config.m4 | 3 | ||||
| -rw-r--r-- | server/mpm/dexter/config.m4 | 3 | ||||
| -rw-r--r-- | server/mpm/mpmt_beos/config.m4 | 3 | ||||
| -rw-r--r-- | server/mpm/mpmt_pthread/config.m4 | 3 | ||||
| -rw-r--r-- | server/mpm/perchild/config.m4 | 3 | ||||
| -rw-r--r-- | server/mpm/prefork/config.m4 | 3 |
6 files changed, 6 insertions, 12 deletions
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) |