--- parser3/Attic/buildall-without-xml	2012/06/13 07:42:53	1.32
+++ parser3/Attic/buildall-without-xml	2012/06/21 09:04:55	1.35
@@ -1,18 +1,22 @@
 #!/bin/sh
 
-# $Id: buildall-without-xml,v 1.32 2012/06/13 07:42:53 moko Exp $
+# $Id: buildall-without-xml,v 1.35 2012/06/21 09:04:55 moko Exp $
 
 install_directory=$HOME/parser3install
 sendmail_command="/usr/sbin/sendmail -i -t -f postmaster"
-download="wget -c --passive-ftp"
 cflags=""
-cflags="CFLAGS=-fPIC CXXFLAGS=-fPIC" #required for apache module on x64
+#cflags="--with-pic" #required for apache module on x64
 
 echo "buildall-without-xml"
 echo "Script author: Alexander Petrosian <paf@design.ru> (http://paf.design.ru)"
 echo
 echo "Building..."
 
+download=`which fetch 2>/dev/null`
+if test -z "$download"; then
+	download="wget -c --passive-ftp"
+fi
+
 parser3_directory=`pwd`
 cd ..
 project_directory=`pwd`
@@ -23,20 +27,20 @@ if test ! -f "$project_directory/gc/lib/
 # libgc="gc6.8" # FreeBSD 4.X is not supported in newer gc version
   libgc="gc-7.1"
   if test ! -f "$libgc.tar.gz"; then
-    echo "Downloading libgc [1 lib of 2]..."
+    echo "Downloading gc [1 lib of 2]..."
     $download http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/$libgc.tar.gz
   fi
   echo "Unpacking gc..."
   rm -rf $libgc
   gunzip -c $libgc.tar.gz | tar vxf - >/dev/null
   cd $libgc
-  echo "Configuring libgc..."
+  echo "Configuring gc..."
   CPPFLAGS="-DUSE_LIBC_PRIVATES -DUSE_MMAP -DDONT_ADD_BYTE_AT_END" \
   	./configure --prefix=$project_directory/gc \
   		--disable-threads \
   		--disable-shared \
   		--silent $cflags
-  echo "Building libgc..."
+  echo "Building gc..."
   make
   make install
   cd ..
@@ -54,10 +58,8 @@ if test ! -f "$project_directory/pcre/li
   rm -rf $libpcre
   gunzip -c $libpcre.tar.gz | tar vxf - >/dev/null
   cd $libpcre
-  current_dir=`pwd`
   echo "Configuring pcre..."
   ./configure --prefix="$project_directory/pcre" \
-    --with-match-limit=10000 \
     --with-match-limit-recursion=10000 \
     --enable-utf8 \
     --enable-unicode-properties \
@@ -77,13 +79,13 @@ cd $parser3_directory
 
 if test ! -f "Makefile"; then
   options="$@"
-  options="$options --with-static-gc=$project_directory/gc/lib"
-  options="$options --with-static-pcre=$project_directory/pcre"
+  options="$options --with-gc=$project_directory/gc/lib"
+  options="$options --with-pcre=$project_directory/pcre"
+#  options="$options --with-apache"
 #  options="$options --disable-safe-mode"
 #  options="$options --disable-stringstream"
   options="$options --with-included-ltdl"
   options="$options --silent $cflags"
-
   echo "Configuring parser3..."
   ./configure --prefix=$install_directory "--with-sendmail=$sendmail_command" $options
 fi
@@ -100,9 +102,8 @@ echo "DONE"
 echo
 echo
 echo "********************************************************************************************************"
-echo "Now you can copy $install_directory with subdirectories"
+echo "Now you can copy $install_directory/bin to your cgi-bin directory"
 echo "  -Parser3 WITHOUT XML support-"
-echo "to your cgi-bin directory"
 echo "Read more about installing Parser here:"
 echo "  http://www.parser.ru/en/docs/lang/install4apachecgi.htm in English"
 echo "  http://www.parser.ru/docs/lang/install4apachecgi.htm in Russian"