summaryrefslogtreecommitdiff
path: root/modules/arch
diff options
context:
space:
mode:
authorJeff Trawick <trawick@apache.org>2009-11-03 00:38:06 +0000
committerJeff Trawick <trawick@apache.org>2009-11-03 00:38:06 +0000
commit33e15a38e8fcaafd3f89aa6f315559657aa2f4cc (patch)
treeaea165ea176afa8c84e3004ccc147fc519583963 /modules/arch
parentbaecf9e13f7d3cc481ce9084c80f8dcde17fa777 (diff)
downloadhttpd-33e15a38e8fcaafd3f89aa6f315559657aa2f4cc.tar.gz
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 'modules/arch')
-rw-r--r--modules/arch/unix/config5.m411
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/arch/unix/config5.m4 b/modules/arch/unix/config5.m4
index 1815b6198b..01c6e6938e 100644
--- a/modules/arch/unix/config5.m4
+++ b/modules/arch/unix/config5.m4
@@ -1,12 +1,13 @@
APACHE_MODPATH_INIT(arch/unix)
-if test "$APACHE_MPM" = "simple" -o "$APACHE_MPM" = "worker" \
- -o "$APACHE_MPM" = "event" -o "$APACHE_MPM" = "prefork" \
- -o "$APACHE_MPM" = "shared"; then
- unixd_mods_enable=yes
+if ap_mpm_is_enabled "simple" \
+ || ap_mpm_is_enabled "worker" \
+ || ap_mpm_is_enabled "event" \
+ || ap_mpm_is_enabled "prefork"; then
+ unixd_mods_enable=yes
else
- unixd_mods_enable=no
+ unixd_mods_enable=no
fi
APACHE_MODULE(unixd, unix specific support, , , $unixd_mods_enable)