X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=bin%2Fvellumweb-build;h=ed8e91682b985dabe3c5b82c966424da1712ca8b;hb=63a8b76e0ce51e542517511d6149645b956c9de4;hp=8c8407f065b8d63655cff08d5de4a61a0b97bcfc;hpb=93df9f0488349fb5e944f8f1a9f5b9ae172c50a5;p=nethome.git

diff --git a/bin/vellumweb-build b/bin/vellumweb-build
index 8c8407f..ed8e916 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
+	httpd=apache_1.3.27
 	openssl=openssl-0.9.6g
-	modssl=mod_ssl-2.8.10-1.3.26
+	modssl=mod_ssl-2.8.11-1.3.27
 	php=php-4.2.3
 	modperl=mod_perl-1.27
 	"
+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
@@ -60,6 +62,7 @@ pushd $php
 	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,13 +70,17 @@ 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 \