X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=bin%2Fvellumweb-build;h=b35538437a00dc4d5fb48781234ca05ecbfecf8d;hb=94b24b7859797c88f07cfcfc19579d51f3c82345;hp=52ff9ffeb83c14a4168283096178a96ccb5d8b50;hpb=75cf0c158898f8c9658158f7a51ed874dc03d062;p=nethome.git

diff --git a/bin/vellumweb-build b/bin/vellumweb-build
index 52ff9ff..b355384 100755
--- a/bin/vellumweb-build
+++ b/bin/vellumweb-build
@@ -5,12 +5,13 @@
 arch=$HOME/arch
 prefix=/usr/local/apache
 pkgs="
-	httpd=apache_1.3.26
-	openssl=openssl-0.9.6e
-	modssl=mod_ssl-2.8.10-1.3.26
-	php=php-4.2.2
-	modperl=mod_perl-1.27
+	httpd=apache_1.3.31
+	openssl=openssl-0.9.7d
+	modssl=mod_ssl-2.8.18-1.3.31
+	php=php-4.3.6
+	modperl=mod_perl-1.29
 	"
+with_perl=false
 export CFLAGS="-ggdb3"
 
 #-----------------------------------------------------------------------------
@@ -21,6 +22,7 @@ trap 'if $do_failed;then echo "FAILED FAILED FAILED!";fi' EXIT
 set -e
 eval "$pkgs"
 echo "$pkgs"|sed -n 's/=/ /p'|while read -r pkg pkgb;do
+	! $with_perl && test $pkg = modperl && continue
 	  if test -f $arch/$pkgb.tar.gz ;then pkgarchext=.tar.gz ;z=z
 	elif test -f $arch/$pkgb.tgz    ;then pkgarchext=.tgz    ;z=z
 	elif test -f $arch/$pkgb.tar.bz2;then pkgarchext=.tar.bz2;z=j
@@ -55,11 +57,16 @@ pushd $php
 		--with-mysql`d=/usr/local/mysql && test -d $d && echo =$d` \
 		--enable-track-vars \
 		--enable-memory-limit=yes \
-		--enable-debug=no
+		--enable-debug=no \
+		--with-gd \
+				--with-zlib-dir=/usr/lib \
+				--with-jpeg-dir=/usr/lib \
+		--with-iconv
 	make
 	make install
 popd
 
+if $with_perl;then
 pushd $modperl
 	perl Makefile.PL APACHE_SRC=../$httpd DO_HTTPD=1 USE_APACI=1 PREP_HTTPD=1 EVERYTHING=1 \
 			PERL_DEBUG=1
@@ -67,17 +74,22 @@ pushd $modperl
 #	make test	# requires running httpd!
 	make install UNINST=1
 popd
+fi
 
 pushd $httpd
 	OPTIM="$CFLAGS" SSL_BASE="$PWD/../$openssl" ./configure --prefix=$prefix \
 			--enable-module=ssl \
 			--activate-module=src/modules/php4/libphp4.a \
-			--activate-module=src/modules/perl/libperl.a \
-					--disable-rule=EXPAT \
+			$(if $with_perl;then echo \
+				--activate-module=src/modules/perl/libperl.a \
+						--disable-rule=EXPAT \
+				;fi
+				) \
 			--enable-module=so \
 			--enable-module=headers \
 			--enable-module=rewrite \
-			--enable-module=auth_anon
+			--enable-module=auth_anon \
+			--enable-module=proxy
 	make
 	make install
 popd