Check for automake version in buildconf.sh - not in configure.

We don't want distribution tars to check (they don't need automake
at all).

diff --git a/buildconf.sh b/buildconf.sh
index 82c872b..01eb1b7 100755 (executable)
--- a/buildconf.sh
+++ b/buildconf.sh
@@ -1,5 +1,15 @@
 #!/bin/sh
-# $Id: buildconf.sh,v 1.2 2005-10-07 09:21:41 marc Exp $
+# $Id: buildconf.sh,v 1.3 2005-10-08 09:48:32 adam Exp $
+
+if automake --version|head -1 |grep '1\.[4-8]'; then
+    echo "automake 1.4-1.8 is active. You should use automake 1.9 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 m4
 autoheader

diff --git a/configure.ac b/configure.ac
index aa902a3..b611303 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -132,18 +132,3 @@ Configuration:
   Automake:                   ${AUTOMAKE}
 
 ------------------------------------------------------------------------"
-automake --version| grep 1.4  > /dev/null ||  \
-automake --version| grep 1.5  > /dev/null ||  \
-automake --version| grep 1.6  > /dev/null ||  \
-automake --version| grep 1.7  > /dev/null ||  \ 
-automake --version| grep 1.8  > /dev/null     \ 
-&& echo \
-"  YOUR AUTOMAKE IS TOO OLD - USE VERSION 1.9 OR NEWER
-
-  On a Debian system run
-
-  sudo apt-get install automake1.9
-  sudo update-alternatives --config automake
-
-"
-