Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv2874
Modified Files:
Tag: rel-1-2-patches
httpd
Log Message:
synced to 1.3-branch
Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.3.2.5
retrieving revision 1.3.2.6
diff -u -d -r1.3.2.5 -r1.3.2.6
--- httpd 30 Jul 2007 13:42:28 -0000 1.3.2.5
+++ httpd 1 Aug 2007 08:15:09 -0000 1.3.2.6
@@ -10,7 +10,7 @@
### BEGIN INIT INFO
# Provides: httpd
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs perl
# Required-Stop:
# Default-Start: 1 2
# Default-Stop:
@@ -34,14 +34,26 @@
PARAMS="$PARAMS --enable-nonportable-atomics=yes"
fi
PARAMS="$PARAMS --enable-rewrite"
- PARAMS="$PARAMS --enable-proxy"
- PARAMS="$PARAMS --enable-proxy-ajp"
- PARAMS="$PARAMS --enable-proxy-balancer"
- PARAMS="$PARAMS --enable-proxy-connect"
- PARAMS="$PARAMS --enable-proxy-ftp"
- PARAMS="$PARAMS --enable-proxy-http"
- PARAMS="$PARAMS --enable-dav --enable-dav-fs --enable-dav-lock"
- PARAMS="$PARAMS --enable-cache --enable-mem-cache --enable-disk-cache"
+ if [ "$CONFIG_HTTPD_PROXY" = "y" ]; then
+ PARAMS="$PARAMS --enable-proxy"
+ PARAMS="$PARAMS --enable-proxy-ajp"
+ PARAMS="$PARAMS --enable-proxy-balancer"
+ PARAMS="$PARAMS --enable-proxy-connect"
+ PARAMS="$PARAMS --enable-proxy-ftp"
+ PARAMS="$PARAMS --enable-proxy-http"
+ else
+ PARAMS="$PARAMS --disable-proxy"
+ fi
+ if [ "$CONFIG_HTTPD_DAV" = "y" ]; then
+ PARAMS="$PARAMS --enable-dav --enable-dav-fs --enable-dav-lock"
+ else
+ PARAMS="$PARAMS --disable-dav"
+ fi
+ if [ "$CONFIG_HTTPD_CACHE" = "y" ]; then
+ PARAMS="$PARAMS --enable-cache --enable-mem-cache --enable-disk-cache --enable-file-cache"
+ else
+ PARAMS="$PARAMS --disable-cache"
+ fi
PARAMS="$PARAMS --enable-cgi --enable-cgid"
if [ "$CONFIG_HTTPD_SUEXEC" = "y" ]; then
PARAMS="$PARAMS --enable-suexec --with-suexec-caller=www"
|