X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=386ddbcb7d56ae17a332e388a0513ad71909d669;hp=ba45bc904da59d699aedd9b6e8733d830d9d8372;hb=4b3585940162cf9ca65ca4a6914c0addcde50eef;hpb=f8b1fb4b708542891a98c2eb7f1e1d5fadd2a33a

diff --git a/buildconf.sh b/buildconf.sh
index ba45bc9..386ddbc 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,12 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.13 2006-03-30 07:45:55 adam Exp $
+
+test -d config || mkdir config
+if test -d m4/.git -a -d doc/common/.git; then
+    :
+else
+    git submodule init
+    git submodule update
+fi
 
 if automake --version|head -1 |grep '1\.[4-7]'; then
     echo "automake 1.4-1.7 is active. You should use automake 1.8 or later"
@@ -12,7 +19,7 @@ fi
 
 set -x
 # I am tired of underquoted warnings for Tcl macros
-aclocal -I . 2>&1 | grep -v aclocal/tcl.m4
+aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
 libtoolize --automake --force 
 automake --add-missing 
 autoconf
@@ -42,7 +49,7 @@ esac
 
 if $enable_configure; then
     if test -n "$sh_flags"; then
-	CFLAGS="$sh_flags" CXXFLAGS="$sh_flags" ./configure $*
+	CFLAGS="$sh_flags" CXXFLAGS="$sh_flags" ./configure --disable-shared --enable-static $*
     else
 	./configure $*
     fi
@@ -71,8 +78,8 @@ Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
 When building from a CVS checkout, you need these Debian tools:
-  autoconf, automake, libtool, gcc, libyaz-dev, docbook-utils, docbook,
-  docbook-xml, docbook-dsssl, jade, jadetex, libxml2-dev,
-  libssl-dev, libreadline5-dev
+  autoconf, automake, libtool, gcc, g++, libyaz-dev,
+  xsltproc, docbook, docbook-xml, docbook-xsl, make,
+  libssl-dev, libreadline5-dev, g++
 EOF
 fi