diff options
| author | Jeff Trawick <trawick@apache.org> | 2009-11-03 01:38:06 +0100 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2009-11-03 01:38:06 +0100 |
| commit | 33e15a38e8fcaafd3f89aa6f315559657aa2f4cc (patch) | |
| tree | aea165ea176afa8c84e3004ccc147fc519583963 /server/mpm/config.m4 | |
| parent | Moves another rule out of rewrite_guide, and updates it for modern (diff) | |
| download | apache2-33e15a38e8fcaafd3f89aa6f315559657aa2f4cc.tar.xz apache2-33e15a38e8fcaafd3f89aa6f315559657aa2f4cc.zip | |
more configure-time support for dynamically loadable MPMs:
. axe --with-mpm="shared" hack, replace with --enable-mpms-shared={all|list}
. replace singular MPM_NAME with access to the list of enabled MPMs
. replace singular MPM_SUBDIR with list MPM_SUBDIRS
. enable OS/2 MPM in same manner as others with configure support instead of
hard-coding in configure.in
Current state: MPMs are built as static archives (but not linked to httpd) with
--enable-mpms-shared, so they still have to be built with apxs to load
dynamically.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@832228 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/config.m4')
| -rw-r--r-- | server/mpm/config.m4 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/server/mpm/config.m4 b/server/mpm/config.m4 index 04d8562981..963bb18e7a 100644 --- a/server/mpm/config.m4 +++ b/server/mpm/config.m4 @@ -63,9 +63,7 @@ ap_mpm_is_supported () ap_mpm_is_threaded () { - dnl Special support for --with-mpm=shared - dnl Assume a threaded MPM can be used. - if test "x$MPM_NAME" = "xshared"; then + if test "$mpm_build" = "shared" -a ac_cv_define_APR_HAS_THREADS = "yes"; then return 0 fi @@ -76,3 +74,12 @@ ap_mpm_is_threaded () done return 1 } + +ap_mpm_is_enabled () +{ + if echo "$ENABLED_MPMS" | grep " $1 " >/dev/null; then + return 0 + else + return 1 + fi +} |