[Lunar-commits] r21174 - moonbase/trunk/web/apache2

[Auke Kok]

Author: sofar
Date: 2006-08-29 03:39:24 +0000 (Tue, 29 Aug 2006)
New Revision: 21174

Modified:
   moonbase/trunk/web/apache2/BUILD
   moonbase/trunk/web/apache2/CONFIGURE
Log:
Allow user to pick worker/prefork threading model. Default is the same (prefork) and the comment hints towards usability with 2.6+nptl threads.


Modified: moonbase/trunk/web/apache2/BUILD
===================================================================
--- moonbase/trunk/web/apache2/BUILD	2006-08-28 21:16:02 UTC (rev 21173)
+++ moonbase/trunk/web/apache2/BUILD	2006-08-29 03:39:24 UTC (rev 21174)
@@ -1,9 +1,9 @@
 (
 
   prepare_install  &&
-  
+
   OPTS="$OPTS  --prefix=/etc/httpd                      \
-	       --sysconfdir=/etc/httpd/conf             \
+               --sysconfdir=/etc/httpd/conf             \
                --exec-prefix=/usr                       \
                --sbindir=/usr/sbin                      \
                --libexecdir=/usr/libexec/httpd/modules  \
@@ -20,18 +20,17 @@
                --enable-exception-hook                  \
                --enable-layout=GNU                      \
                --enable-usertrack                       \
-	       --with-mpm=prefork                       \
-	       --with-apr=/usr                          \
-	       --with-apr-util=/usr"
+               --with-apr=/usr                          \
+               --with-apr-util=/usr"
 
   if [ "$ENABLE_SUEXEC" == "y" ] ; then
     OPTS="$OPTS --enable-suexec --with-suexec               \
-	       --with-suexec-caller=nobody                  \
-	       --with-suexec-docroot=/var/www               \
-	       --with-suexec-logfile=/var/log/httpd/suexec  \
-	       --with-suexec-bin=/usr/sbin/suexec           \
-	       --with-suexec-uidmin=500                     \
-	       --with-suexec-gidmin=500"
+               --with-suexec-caller=nobody                  \
+               --with-suexec-docroot=/var/www               \
+               --with-suexec-logfile=/var/log/httpd/suexec  \
+               --with-suexec-bin=/usr/sbin/suexec           \
+               --with-suexec-uidmin=500                     \
+               --with-suexec-gidmin=500"
   fi
 
   if [ "$ENABLE_SSL" == "y" ] ; then
@@ -40,7 +39,7 @@
 
   if [ "$ENABLE_PROXY" == "y" ] ; then
     OPTS="$OPTS --enable-proxy --enable-proxy-connect  \
-	       --enable-proxy-http --enable-proxy-ftp"
+                --enable-proxy-http --enable-proxy-ftp"
   fi
 
   if [ "$ENABLE_DAV" == "y" ] ; then
@@ -69,6 +68,12 @@
     OPTS="$OPTS --enable-spelling"
   fi
 
+  if [ "$USE_WORKER" == "n" ]; then
+    OPTS="$OPTS --with-mpm=prefork"
+  else
+    OPTS="$OPTS --with-mpm=worker"
+  fi
+
   echo "CFLAGS=$CFLAGS"     &&
   echo "OPTS=`echo $OPTS`"  &&
   ./configure $OPTS         &&

Modified: moonbase/trunk/web/apache2/CONFIGURE
===================================================================
--- moonbase/trunk/web/apache2/CONFIGURE	2006-08-28 21:16:02 UTC (rev 21173)
+++ moonbase/trunk/web/apache2/CONFIGURE	2006-08-29 03:39:24 UTC (rev 21174)
@@ -7,3 +7,4 @@
 mquery ENABLE_INFO "Enable Info ?" n
 mquery ENABLE_VHOST "Enable mass virtual hosting module ?" n
 mquery ENABLE_SPELL "Enable spelling ?" n
+mquery USE_WORKER "Use worker threading model (for 2.6+nptl threading) ?" n