[Devil-linux-commit] build/scripts httpd,1.14,1.15

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv31804/scripts

Modified Files:
	httpd 
Log Message:
- moved changes in changelog file to the correct RC4 location
- removed some redundant options from httpd compile script
- don't use the pcre bundled with apache


Index: httpd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/httpd,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- httpd	6 Jan 2010 15:20:24 -0000	1.14
+++ httpd	24 Apr 2010 14:12:01 -0000	1.15
@@ -24,7 +24,6 @@
                         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"
@@ -51,23 +50,16 @@
                         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-ssl=shared"
                         PARAMS="$PARAMS --enable-mods-shared=all --enable-layout=Debian"
+                        PARAMS="$PARAMS --with-pcre"
+                        PARAMS="$PARAMS --enable-pie"
 			./configure $PARAMS || exit 1
-			# not working --enable-ldap --enable-auth-ldap
 			make $PMAKE all || exit 1
 			strip_debug
 			# install it, we need the libraries later