X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=bee20bee5c2f2fd6c7bcd8a62cd873880b4ea095;hp=c9645affc0001eee9cc410d4a8a31c65b0b1aaa7;hb=d8b577d9635dccf489ddb3955c795fb1f754fad3;hpb=2cb1374ad9b888dcb3462ec15b977fbb3a97c7cf

diff --git a/buildconf.sh b/buildconf.sh
index c9645af..bee20be 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,10 +1,20 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.22 2006-01-20 10:34:50 adam Exp $
+# $Id: buildconf.sh,v 1.27 2006-03-30 16:30:25 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
@@ -17,7 +27,7 @@ sh_flags=""
 conf_flags=""
 case $1 in
     -d)
-	sh_flags="-g -Wall -ansi"
+	sh_flags="-g -Wall"
 	enable_configure=true
 	enable_help=false
 	shift
@@ -61,8 +71,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, bison, gcc, libtools,
+  autoconf, automake, bison, gcc, libtool,
   docbook-utils, docbook, docbook-xml, docbook-dsssl, jade, jadetex,
-  libxml2-dev, libssl-dev, libreadline4-dev, libwrap0-dev, any tcl
+  libxml2-dev, libssl-dev, libreadline5-dev, libwrap0-dev, any tcl
 EOF
 fi