X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=a661483f46e17775fe1f7548ed83ef44b8cfae26;hp=2788acd17eb4ceee713d802dac225f78dcf6355e;hb=63caccd96329d38750b23c1962bc6a37e7d3c7b5;hpb=b6d98b185326125463fae2adc017dcde90b9f408

diff --git a/buildconf.sh b/buildconf.sh
index 2788acd..a661483 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,10 +1,20 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.11 2005-05-17 20:34:28 adam Exp $
+# $Id: buildconf.sh,v 1.17 2006-07-07 06:21:29 adam Exp $
+
+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"
+    if test -f /etc/debian_version; then
+        echo " sudo apt-get install automake1.9"
+        echo " sudo update-alternatives --config automake"
+    fi
+    exit 1
+fi
+
 set -x
-aclocal -I .
+# I am tired of underquoted warnings for Tcl macros
+aclocal -I m4 2>&1 | grep -v aclocal/tcl.m4
 libtoolize --automake --force 
 automake --add-missing 
-automake --add-missing 
 autoconf
 set -
 if [ -f config.cache ]; then
@@ -32,7 +42,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
@@ -61,7 +71,8 @@ Or just build the Debian packages without configuring
   dpkg-buildpackage -rfakeroot
 
 When building from a CVS checkout, you need these Debian tools:
-  libyaz-dev, docbook-utils, docbook, docbook-xml, docbook-dsssl, jade,
-  jadetex, libxml2-dev, libssl-dev, libreadline4-dev
+  autoconf, automake, libtool, gcc, g++, libyaz-dev,
+  xsltproc, docbook, docbook-xml, docbook-xsl, make,
+  libssl-dev, libreadline5-dev, g++
 EOF
 fi