X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fvellumweb-build;h=dbc0c0ac17a6d8e79611ec4aa6f0388c189fd173;hp=9d8b28b71f5cee4f0092023f4da00f5bb74561a4;hb=HEAD;hpb=b4bf8508b784ab697d06bc99ffcbd702fe548f02

diff --git a/bin/vellumweb-build b/bin/vellumweb-build
index 9d8b28b..dbc0c0a 100755
--- a/bin/vellumweb-build
+++ b/bin/vellumweb-build
@@ -2,16 +2,14 @@
 #
 # $Id$
 
-arch=$HOME/arch
+arch=${arch:-$HOME/arch}
 prefix=/usr/local/apache
 pkgs="
-	httpd=apache_1.3.29
-	openssl=openssl-0.9.7c
-	modssl=mod_ssl-2.8.16-1.3.29
-	php=php-4.3.3
-	modperl=mod_perl-1.28
+	httpd=apache_1.3.33
+	openssl=openssl-0.9.7e
+	modssl=mod_ssl-2.8.22-1.3.33
+	php=php-4.3.10
 	"
-with_perl=false
 export CFLAGS="-ggdb3"
 
 #-----------------------------------------------------------------------------
@@ -22,7 +20,6 @@ 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
@@ -53,37 +50,23 @@ pushd $modssl
 popd
 
 pushd $php
-	./configure --with-apache=../$httpd \
+	./configure --prefix=$prefix --with-apache=../$httpd \
 		--with-mysql`d=/usr/local/mysql && test -d $d && echo =$d` \
 		--enable-track-vars \
 		--enable-memory-limit=yes \
 		--enable-debug=no \
 		--with-gd \
 				--with-zlib-dir=/usr/lib \
-				--with-jpeg-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
-	make
-#	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 \
-			$(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 \