From 5cfe90d60ce97c9d9d8d659539199912626bb2a8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 4 Sep 2009 12:04:51 -0400 Subject: [PATCH] Revert "Accept automake 1.10 and 1.11" This reverts commit 76dab7b3b745c285f814311b071fefc8244d5245. --- autogen.sh | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/autogen.sh b/autogen.sh index 66e4f03357..d3fb066d3e 100755 --- a/autogen.sh +++ b/autogen.sh @@ -45,24 +45,16 @@ fi DIE=1 } -if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then - AUTOMAKE=automake-1.11 - ACLOCAL=aclocal-1.11 -else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then - AUTOMAKE=automake-1.10 - ACLOCAL=aclocal-1.10 -else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then +if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then AUTOMAKE=automake-1.7 ACLOCAL=aclocal-1.7 else echo - echo "You must have automake 1.7.x, 1,10.x or 1.11.x installed to compile $PROJECT." + echo "You must have automake 1.7.x installed to compile $PROJECT." echo "Install the appropriate package for your distribution," echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" DIE=1 fi -fi -fi if test "$DIE" -eq 1; then exit 1