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

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

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

Modified Files:
	httpd 
Log Message:
added some config-settings for Apache (choose MPM, cache, WebDAV, ...)


Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- httpd	20 Mar 2007 02:41:45 -0000	1.9
+++ httpd	25 Jul 2007 13:44:01 -0000	1.10
@@ -28,14 +28,28 @@
 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_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"
+			fi
+			if [ "$CONFIG_HTTP_DAV" = "y" ]; then
+				PARAMS="$PARAMS --enable-dav --enable-dav-fs --enable-dav-lock"
+			fi
+			if [ "$CONFIG_HTTPD_CACHE" = "y" ]; then
+                                PARAMS="$PARAMS --enable-mem-cache  --enable-disk-cache --enable-cache"
+                        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"
+			./configure $PARAMS || exit 1
 			# not working --enable-ldap --enable-auth-ldap
 			make $PMAKE all || exit 1
 			strip_debug