X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=buildconf.sh;h=970f81e22e469fe0e057ad4dd8a3885ad879035b;hp=f862842fdddb8fb17e6ac17a89366c3fb0a62330;hb=95d8bd04e10519a635972a24176270ef4dbe8d2c;hpb=38e70c83aac4fabf9280fa246921e57d725424de

diff --git a/buildconf.sh b/buildconf.sh
index f862842..970f81e 100755
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,10 +1,20 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.21 2005-07-18 10:06:36 marc Exp $
+# $Id: buildconf.sh,v 1.29 2006-05-03 12:02:23 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"
+	sh_flags="-g -Wall -Wdeclaration-after-statement"
 	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
+  libxslt1-dev, libssl-dev, libreadline5-dev, libwrap0-dev, any tcl
 EOF
 fi