[Devil-linux-commit] build/scripts httpd,1.3.2.4,1.3.2.5

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

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

Modified Files:
      Tag: rel-1-2-patches
	httpd 
Log Message:
done some "backports" of menuconfig from 1.3-branch


Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -d -r1.3.2.4 -r1.3.2.5
--- httpd	27 Feb 2007 14:20:55 -0000	1.3.2.4
+++ httpd	30 Jul 2007 13:42:28 -0000	1.3.2.5
@@ -28,14 +28,42 @@
 case $1 in
 	build )
 		if [ "$CONFIG_HTTPD" = "y" ]; then
-			./configure --enable-v4-mapped --enable-auth-anon --enable-auth-dbm --enable-auth-digest \
-				--enable-case-filter --enable-case-filter-in --enable-ext-filter \
-				--enable-deflate  --enable-logio --enable-mime-magic --enable-cern-meta --enable-expires --enable-headers \
-				--enable-usertrack --enable-unique-id --enable-proxy --enable-proxy-connect --enable-proxy-ftp --enable-proxy-http \
-				--enable-ssl=shared --enable-bucketeer --enable-http  --enable-info --enable-cgi --enable-vhost-alias \
-				--enable-rewrite --enable-so --enable-dav --enable-dav-fs \
-				--enable-mods-shared=all --enable-suexec --with-suexec-caller=www \
-				--enable-layout=Debian --enable-mem-cache  --enable-disk-cache --enable-cache || exit 1
+			PARAMS=""
+			PARAMS="$PARAMS --with-mpm=$CONFIG_HTTPD_MPM"
+			if [ "$CONFIG_HTTPD_NONPORTATOM" = "y" ]; then
+				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"
+			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-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
 			strip_debug