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

[Jerry Lundström]

Author: prox
Date: 2007-04-08 14:49:13 +0200 (Sun, 08 Apr 2007)
New Revision: 23970

Modified:
   moonbase/trunk/web/apache2/BUILD
   moonbase/trunk/web/apache2/CONFIGURE
Log:
new mquery syntax doesnt work

Modified: moonbase/trunk/web/apache2/BUILD
===================================================================
--- moonbase/trunk/web/apache2/BUILD	2007-04-08 12:01:28 UTC (rev 23969)
+++ moonbase/trunk/web/apache2/BUILD	2007-04-08 12:49:13 UTC (rev 23970)
@@ -2,28 +2,72 @@
 
   prepare_install  &&
 
-  OPTS="--prefix=/etc/httpd                      \
-        --sysconfdir=/etc/httpd/conf             \
-        --exec-prefix=/usr                       \
-        --sbindir=/usr/sbin                      \
-        --libexecdir=/usr/libexec/httpd/modules  \
-        --datadir=/var/www                       \
-        --sharedstatedir=/var/run/httpd          \
-        --localstatedir=/var                     \
-        --libdir=/usr/lib                        \
-        --includedir=/usr/include/httpd          \
-        --infodir=/usr/share/info                \
-        --mandir=/usr/share/man                  \
-        --enable-so                              \
-        --enable-rewrite                         \
-        --enable-mime-magic                      \
-        --enable-exception-hook                  \
-        --enable-layout=GNU                      \
-        --enable-usertrack                       \
-        --with-apr=/usr                          \
-        --with-apr-util=/usr                     \
-        $OPTS"
+  OPTS="$OPTS  --prefix=/etc/httpd                      \
+               --sysconfdir=/etc/httpd/conf             \
+               --exec-prefix=/usr                       \
+               --sbindir=/usr/sbin                      \
+               --libexecdir=/usr/libexec/httpd/modules  \
+               --datadir=/var/www                       \
+               --sharedstatedir=/var/run/httpd          \
+               --localstatedir=/var                     \
+               --libdir=/usr/lib                        \
+               --includedir=/usr/include/httpd          \
+               --infodir=/usr/share/info                \
+               --mandir=/usr/share/man                  \
+               --enable-so                              \
+               --enable-rewrite                         \
+               --enable-mime-magic                      \
+               --enable-exception-hook                  \
+               --enable-layout=GNU                      \
+               --enable-usertrack                       \
+               --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"
+  fi
+
+  if [ "$ENABLE_SSL" == "y" ] ; then
+    OPTS="$OPTS --enable-ssl"
+  fi
+
+  if [ "$ENABLE_PROXY" == "y" ] ; then
+    OPTS="$OPTS --enable-proxy --enable-proxy-connect  \
+                --enable-proxy-http --enable-proxy-ftp"
+  fi
+
+  if [ "$ENABLE_DAV" == "y" ] ; then
+    OPTS="$OPTS --enable-dav --enable-dav-fs --enable-dav-lock"
+  fi
+
+  if [ "$ENABLE_INFO" == "y" ] ; then
+    OPTS="$OPTS --enable-info"
+  fi
+
+  if [ "$ENABLE_DEFLATE" == "y" ] ; then
+    OPTS="$OPTS --enable-deflate"
+  fi
+
+  if [ "$ENABLE_CGID" == "y" ] ; then
+    OPTS="$OPTS --enable-cgid"
+  else
+    OPTS="$OPTS --enable-cgi"
+  fi
+
+  if [ "$ENABLE_VHOST" == "y" ] ; then
+    OPTS="$OPTS --enable-vhost-alias"
+  fi
+
+  if [ "$ENABLE_SPELL" == "y" ] ; then
+    OPTS="$OPTS --enable-spelling"
+  fi
+
   if [ "$USE_WORKER" == "n" ]; then
     OPTS="$OPTS --with-mpm=prefork"
   else

Modified: moonbase/trunk/web/apache2/CONFIGURE
===================================================================
--- moonbase/trunk/web/apache2/CONFIGURE	2007-04-08 12:01:28 UTC (rev 23969)
+++ moonbase/trunk/web/apache2/CONFIGURE	2007-04-08 12:49:13 UTC (rev 23970)
@@ -1,10 +1,10 @@
-mquery ENABLE_SSL "Enable TLS/SSL ?" y --enable-ssl
-mquery ENABLE_PROXY "Enable Proxy support ?" y "--enable-proxy --enable-proxy-connect --enable-proxy-http --enable-proxy-ftp"
-mquery ENABLE_SUEXEC "Enable suexec ?" y "--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"
-mquery ENABLE_DAV "Enable WebDav ?" n "--enable-dav --enable-dav-fs --enable-dav-lock"
-mquery ENABLE_DEFLATE "Enable deflate transfer encoding support ?" n --enable-deflate
-mquery ENABLE_CGID "Enable cgid ?" y --enable-cgid --enable-cgi
-mquery ENABLE_INFO "Enable Info ?" n --enable-info
-mquery ENABLE_VHOST "Enable mass virtual hosting module ?" n --enable-vhost-alias
-mquery ENABLE_SPELL "Enable spelling ?" n --enable-spelling
+mquery ENABLE_SSL "Enable TLS/SSL ?" y
+mquery ENABLE_PROXY "Enable Proxy support ?" y
+mquery ENABLE_SUEXEC "Enable suexec ?" y
+mquery ENABLE_DAV "Enable WebDav ?" n
+mquery ENABLE_DEFLATE "Enable deflate transfer encoding support ?" n
+mquery ENABLE_CGID "Enable cgid ?" y
+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