X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=bin%2Fvellumweb-build;h=75499b8d386c34cb37515d7d1203275edbab8c45;hp=0f1e04d7c25f5aab1bc2883e6b3057fc963a39c2;hb=902ddc4152b2bb3c1225c56dba6bd882a8d53d4f;hpb=122f17e32c18b4dad43ecbf110811ea857f04390

diff --git a/bin/vellumweb-build b/bin/vellumweb-build
index 0f1e04d..75499b8 100755
--- a/bin/vellumweb-build
+++ b/bin/vellumweb-build
@@ -4,15 +4,14 @@
 
 arch=$HOME/arch
 prefix=/usr/local/apache
-csacek_templatedir=$prefix/htdocs/csacek
 pkgs="
-	httpd=apache_1.3.24
-	openssl=openssl-0.9.6c
-	modssl=mod_ssl-2.8.8-1.3.24
-	freetds=freetds-0.53
-	php=php-4.2.0
-	csacek=csacek-2.1.9
+	httpd=apache_1.3.27
+	openssl=openssl-0.9.7a
+	modssl=mod_ssl-2.8.12-1.3.27
+	php=php-4.3.0
+	modperl=mod_perl-1.27
 	"
+with_perl=false
 export CFLAGS="-ggdb3"
 
 #-----------------------------------------------------------------------------
@@ -23,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
@@ -31,37 +31,13 @@ echo "$pkgs"|sed -n 's/=/ /p'|while read -r pkg pkgb;do
 	tar x${z}f $arch/$pkgb$pkgarchext;echo -n .
 done;echo
 
-uudecode -o - <<EOF | gzip -dc | (cd $csacek;patch -Ep1)
-begin 644 cstools.c-2.1.9-pc2degree.diff.gz
-M'XL("-TKQ3P"\`V-S=&]O;',N8RTR+C\$N.2UP8S)D96=R964N9&EF9@#3U=55
-M2"Y.3\$[-UC72,]2SU\$\N+LG/SRG62];-+\I,YPPNS5-P2TU24#!6,#2R,C2V
-M,C%4,#(P,.+2UM;&H9\$SI#15P;&@2,\$(J,?0RMC4RL0\$HL?!04'7T-1,QUQ!
-M&T(Y.'\`I\`(&^EH)W8JZ"ECZ8IY&<GU=<HE":5YR9GI>:HI"<D5BDH*6IH-3O
-MZ-CGZ.S<T.HRP=6UL]NSRV>.W]*IR_UGSEL].SBX+639]-!9<R=%12U(3&Q)
-M3\$YN;TYI2DWM6)C9F].3MV31Y/PI*U>M*"Z>7S)M<6GCC(E55=_T8I1BE'35
-MU14JU-758Y3R@Y5T8.X)<%;P22S)S#,"N4H7GZNV;CO6MZ2_8<VEBQ-67-Y^
-M[?K\$N5,?7WWPJ&OFGQ?/=DR????>R]>SWB[KW;N@^7C+TK;V^5<N-*WLO+&P
-M9U+'M"=/%TWNGO+WU?.U,^:\:UW\N_'-\M7[H*Y:M_[_]?=7KDY9^!7H*.T!
-M=\$#^5T2H>/M[ZEHH.\`<3C*J'CC\^\`J/J\1.7[ZZN3U^^]O1YX_?N_0?_MY^>
-M?0X._A+RZFOHBY^_HJ(.)B9>!\$;5X2,IUU-3CY[,/)US)N_<^0OY9R\=NUQ<
-=?*7DU-72\$S=O557IXXDJ7T=GD'L\`9^@I(,H"\`\`\`\`
-\`
-end
-EOF
-
-set -ex
 (
+set -ex
 
 pushd $httpd
 	./configure --prefix=$prefix
 popd
 
-#pushd $modperl
-#	perl Makefile.PL APACHE_SRC=../$httpd DO_HTTPD=1 EVERYTHING=1
-#	make
-#	make install_perl
-#popd
-
 pushd $openssl
 	rm -rf /usr/local/ssl*
 	./config
@@ -76,40 +52,39 @@ pushd $modssl
 		--with-key=/etc/httpd/conf/ssl.key/server.key
 popd
 
-pushd $freetds
-	rm -rf /usr/local/freetds*
-	./configure --prefix=/usr/local/freetds \
-		--with-tdsver=4.2
-	make
-	make install
-popd
-
 pushd $php
-	./configure --with-mysql=/usr/local/mysql --with-apache=../$httpd \
+	./configure --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-sybase=/usr/local/freetds
+		--enable-debug=no
 	make
 	make install
 popd
 
-pushd $csacek
-	./configure --with-target=Apache \
-		--with-templatedir=$csacek_templatedir
-	make mod_csacek.c
-	cp -p mod_csacek.c cs*.h ../$httpd/src/modules/extra/
-	rm -rf $csacek_templatedir
-	cp -a templates/ $csacek_templatedir
+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 \
-			--activate-module=src/modules/extra/mod_csacek.c \
+			$(if $with_perl;then echo \
+				--activate-module=src/modules/perl/libperl.a \
+						--disable-rule=EXPAT \
+				;fi
+				) \
 			--enable-module=so \
-			--enable-module=headers
+			--enable-module=headers \
+			--enable-module=rewrite \
+			--enable-module=auth_anon
 	make
 	make install
 popd