[Devil-linux-commit] build/scripts httpd,1.10,1.11

[Björn R. <br...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv32646/scripts

Modified Files:
	httpd 
Log Message:
fixed typos (Sorry)


Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- httpd	25 Jul 2007 13:44:01 -0000	1.10
+++ httpd	1 Aug 2007 08:07:55 -0000	1.11
@@ -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:
@@ -29,26 +29,52 @@
 	build )
 		if [ "$CONFIG_HTTPD" = "y" ]; then
 			PARAMS=""
-			PARAMS="$PARAMS --with-mpm=$CONFIG_HTTP_MPM"
-			if [ "$CONFIG_HTTP_NONPORTATOM" = "y" ]; then
-				PARAMS="$PARAMS --enable-nonportable-atomics=yes"
-			fi
-			if [ "$CONFIG_HTTP_PROXY" = "y" ]; then
-				PARAMS="$PARAMS --enable-proxy --enable-proxy-ajp --enable-proxy-balancer --enable-proxy-connect --enable-proxy-ftp --enable-proxy-http"
+                        PARAMS="$PARAMS --with-mpm=$CONFIG_HTTPD_MPM"
+                        if [ "$CONFIG_HTTPD_NONPORTATOM" = "y" ]; then
+                                PARAMS="$PARAMS --enable-nonportable-atomics=yes"
+                        fi
+                        PARAMS="$PARAMS --enable-rewrite"
+			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_HTTP_DAV" = "y" ]; then
+			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-mem-cache  --enable-disk-cache --enable-cache"
+				 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"
+                        else
+                                PARAMS="$PARAMS --disable-suexec"
                         fi
-			PARAMS="$PARAMS --enable-v4-mapped --enable-auth-anon --enable-auth-dbm --enable-auth-digest"
-			PARAMS="$PARAMS --enable-case-filter --enable-case-filter-in --enable-ext-filter"
-			PARAMS="$PARAMS --enable-deflate  --enable-logio --enable-mime-magic --enable-cern-meta --enable-expires --enable-headers"
-			PARAMS="$PARAMS --enable-usertrack --enable-unique-id"
-			PARAMS="$PARAMS --enable-ssl=shared --enable-bucketeer --enable-http  --enable-info --enable-cgi --enable-vhost-alias"
-			PARAMS="$PARAMS --enable-rewrite --enable-so"
-			PARAMS="$PARAMS --enable-mods-shared=all --enable-suexec --with-suexec-caller=www --enable-layout=Debian"
+                        PARAMS="$PARAMS --enable-auth-anon --enable-auth-dbm --enable-auth-digest"
+                        PARAMS="$PARAMS --enable-userdir"
+                        PARAMS="$PARAMS --enable-cern-meta"
+                        PARAMS="$PARAMS --enable-bucketeer"
+                        PARAMS="$PARAMS --enable-case-filter"
+                        PARAMS="$PARAMS --enable-case-filter-in"
+                        PARAMS="$PARAMS --enable-usertrack"
+                        PARAMS="$PARAMS --enable-speling"
+                        PARAMS="$PARAMS --enable-v4-mapped"
+                        PARAMS="$PARAMS --enable-ext-filter"
+                        PARAMS="$PARAMS --enable-deflate --enable-logio --enable-mime-magic --enable-expires --enable-headers"
+                        PARAMS="$PARAMS --enable-unique-id"
+                        PARAMS="$PARAMS --enable-ssl=shared --enable-http --enable-info --enable-vhost-alias"
+                        PARAMS="$PARAMS --enable-so"
+                        PARAMS="$PARAMS --enable-mods-shared=all --enable-layout=Debian"
 			./configure $PARAMS || exit 1
 			# not working --enable-ldap --enable-auth-ldap
 			make $PMAKE all || exit 1