--- parser3/Attic/buildall-without-xml	2012/04/27 02:37:57	1.27
+++ parser3/Attic/buildall-without-xml	2012/06/13 21:44:41	1.33
@@ -1,9 +1,12 @@
 #!/bin/sh
 
-# $Id: buildall-without-xml,v 1.27 2012/04/27 02:37:57 misha Exp $
+# $Id: buildall-without-xml,v 1.33 2012/06/13 21:44:41 moko Exp $
 
 install_directory=$HOME/parser3install
 sendmail_command="/usr/sbin/sendmail -i -t -f postmaster"
+download="wget -c --passive-ftp"
+cflags=""
+#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)"
@@ -21,7 +24,7 @@ if test ! -f "$project_directory/gc/lib/
   libgc="gc-7.1"
   if test ! -f "$libgc.tar.gz"; then
     echo "Downloading libgc [1 lib of 2]..."
-    wget -c http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/$libgc.tar.gz
+    $download http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/$libgc.tar.gz
   fi
   echo "Unpacking gc..."
   rm -rf $libgc
@@ -32,7 +35,7 @@ if test ! -f "$project_directory/gc/lib/
   	./configure --prefix=$project_directory/gc \
   		--disable-threads \
   		--disable-shared \
-  		--silent
+  		--silent $cflags
   echo "Building libgc..."
   make
   make install
@@ -40,13 +43,12 @@ if test ! -f "$project_directory/gc/lib/
   rm -rf $libgc
 fi
 
-
 if test ! -f "$project_directory/pcre/lib/libpcre.a"; then
   cd $project_directory/src
   libpcre="pcre-8.30"
   if test ! -f "$libpcre.tar.gz"; then
     echo "Downloading pcre [2 lib of 2]..."
-    wget -c --passive-ftp ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$libpcre.tar.gz
+    $download ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$libpcre.tar.gz
   fi
   echo "Unpacking pcre..."
   rm -rf $libpcre
@@ -63,34 +65,32 @@ if test ! -f "$project_directory/pcre/li
     --disable-cpp \
     --disable-pcregrep-libz \
     --disable-pcregrep-libbz2 \
-    --silent
+    --silent $cflags
   echo "Building pcre..."
   make
   make install
-  echo "Copying required files (Parser3 uses some PCRE internals)..."
-  cp pcre_internal.h ucp.h $project_directory/pcre/include
   cd ..
   rm -rf $libpcre
 fi
 
-
 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-curl=/usr/include/curl"
+  options="$@"
+  options="$options --with-gc=$project_directory/gc/lib"
+  options="$options --with-pcre=$project_directory/pcre"
 #  options="$options --disable-safe-mode"
-#  options="$options --with-dynamic-stdcpp"
 #  options="$options --disable-stringstream"
-  options="$options --silent"
+  options="$options --with-included-ltdl"
+  options="$options --silent $cflags"
 
   echo "Configuring parser3..."
   ./configure --prefix=$install_directory "--with-sendmail=$sendmail_command" $options
 fi
+
 echo "Building parser3..."
 make install
+if test $? -ne 0; then exit 1; fi
 
 # remove debug info
 # strip ${install_directory}/bin/parser3
@@ -100,9 +100,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"