rse 99/08/15 04:08:25
Modified: mpm config.option
Log:
Cleanup config.option and add LinuxThreads entry..
Revision Changes Path
1.3 +61 -14 apache-2.0/mpm/config.option
Index: config.option
===================================================================
RCS file: /home/cvs/apache-2.0/mpm/config.option,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.option 1999/08/12 11:35:05 1.2
+++ config.option 1999/08/15 11:08:25 1.3
@@ -1,6 +1,6 @@
##
## config.option -- APACI Pre-defined Configuration Options
-## Hints: options can be loaded with APACI's --with-option=ID
+## Hint: options can be loaded with APACI's --with-option=ID
##
# Common standard options
@@ -14,18 +14,62 @@
--disable-module=cgi
</Option>
-# prefork MPM
-# (the good old Apache 1.3 preforking process model)
+##
+## prefork MPM
+## (the good old Apache 1.3 preforking process model)
+##
+
<Option mpm-prefork>
--set-rule=MPM_METHOD:prefork
</Option>
+##
+## Hybrid Variants
+##
+## Assumptions for GNU Pth based variants:
+## - Pth source tree was extracted to apache-mpm/pth/
+## - Pth was configured with ``--enable-pthread --enable-syscall-soft''
+## - Pth was already build (but needs not to be installed)
+## Assumptions for FreeBSD uthread based variants:
+## - FreeBSD uthread is available in libc_r and cc knows ``-pthread''
+## - RSE's poll(2) emulation library stays in apache-apr/poll/
+## - RSE's poll(2) emulation library was already build
+##
+
+##
+## pthread MPM
+##
+
+# pthread MPM with GNU Pth
+<Option mpm-pthread-pth>
+ CFLAGS='-I\$(SRCDIR)/../../pth -DPTHREAD_EVERYWHERE
-DNO_SERIALIZED_ACCEPT'
+ LDFLAGS='-L\$(SRCDIR)/../../pth/.libs'
+ LIBS=-lpthread
+ --set-rule=MPM_METHOD:mpmt_pthread
+</Option>
+
+# pthread MPM with FreeBSD uthread
+<Option mpm-pthread-uthread>
+ CC=cc
+ CFLAGS='-pthread -I\$(SRCDIR)/../../../apache-apr/poll
-DNO_SERIALIZED_ACCEPT'
+ LDFLAGS='-pthread -L\$(SRCDIR)/../../../apache-apr/poll'
+ LIBS=-lpoll
+ --set-rule=MPM_METHOD:mpmt_pthread
+</Option>
+
+# pthread MPM with LinuxThreads
+<Option mpm-dexter-linux>
+ CC=cc
+ CFLAGS='-pthread'
+ LDFLAGS='-pthread'
+ --set-rule=MPM_METHOD:mpmt_pthread
+</Option>
+
+##
+## dexter MPM
+##
+
# dexter MPM with GNU Pth
-# (a portable variant of the hybrid (preforking/prethreading) model)
-# assumptions:
-# - Pth source tree was extracted to apache-mpm/pth/
-# - Pth was configured with ``--enable-pthread --enable-syscall-soft''
-# - Pth was already build (but has not to be installed)
<Option mpm-dexter-pth>
CFLAGS='-I\$(SRCDIR)/../../pth -DPTHREAD_EVERYWHERE
-DNO_SERIALIZED_ACCEPT'
LDFLAGS='-L\$(SRCDIR)/../../pth/.libs'
@@ -33,17 +77,20 @@
--set-rule=MPM_METHOD:dexter
</Option>
-# dexter MPM with FreeBSD's uthread and RSE's poll emulation
-# (a FreeBSD specific variant of the hybrid (preforking/prethreading)
model)
-# assumptions:
-# - FreeBSD uthread is available in libc_r and cc knows ``-pthread''
-# - RSE's poll(2) emulation library stays in apache-apr/poll/
-# - RSE's poll(2) emulation library was already build
+# dexter MPM with FreeBSD uthread
<Option mpm-dexter-uthread>
CC=cc
CFLAGS='-pthread -I\$(SRCDIR)/../../../apache-apr/poll
-DNO_SERIALIZED_ACCEPT'
LDFLAGS='-pthread -L\$(SRCDIR)/../../../apache-apr/poll'
LIBS=-lpoll
+ --set-rule=MPM_METHOD:dexter
+</Option>
+
+# dexter MPM with LinuxThreads
+<Option mpm-dexter-linux>
+ CC=cc
+ CFLAGS='-pthread'
+ LDFLAGS='-pthread'
--set-rule=MPM_METHOD:dexter
</Option>
