From ee27cb933b5794e5c8ae96d86237d3dae56690e8 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 20 May 2002 20:53:06 +0000 Subject: [PATCH] Check for autoconf2.13, and abort if not found. --- ChangeLog | 5 +++++ autogen.sh | 13 +++---------- stepmake/autogen.sh | 15 +++++---------- 3 files changed, 13 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ff2c64240..649163dc4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-05-20 Jan Nieuwenhuizen + + * stepmake/autogen.sh: Check for autoconf2.13, and abort if not + found. + 2002-05-20 Han-Wen * lily/note-head.cc (internal_brew_molecule): warn if note head diff --git a/autogen.sh b/autogen.sh index cc6418a5b1..99c8036240 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,19 +7,12 @@ srcdir=`dirname $0` DIE=0 -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "ERROR: You must have \`autoconf' installed to." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then +version=`autoconf --version 2>/dev/null | awk '{print $3}'` +if test "$version" != "2.13"; then + echo "ERROR: Please install autoconf 2.13" exit 1 fi - if test -z "$*"; then echo "WARNING: I am going to run \`configure' with no arguments." echo "If you wish to pass any to it, please specify them on the" diff --git a/stepmake/autogen.sh b/stepmake/autogen.sh index db1218f170..5048ce8b21 100755 --- a/stepmake/autogen.sh +++ b/stepmake/autogen.sh @@ -4,19 +4,14 @@ srcdir=`dirname $0` DIE=0 -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "ERROR: You must have \`autoconf' installed to." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -if test "$DIE" -eq 1; then +# autoconf > 2.50 is not very common yet, +# and disappointingly incompatible with the widely available 2.13 +version=`autoconf --version 2>/dev/null | awk '{print $3}'` +if test "$version" != "2.13"; then + echo "ERROR: Please install autoconf 2.13" exit 1 fi - if test -z "$*"; then echo "WARNING: I am going to run \`configure' with no arguments." echo "If you wish to pass any to it, please specify them on the" -- 2.39.2