Check for autoconf2.13, and abort if not

found.

diff --git a/ChangeLog b/ChangeLog
index 2ff2c6424076a4e1ca5ce6cc85b02a7118ddda36..649163dc4b1c13aecd56ac1cdf29003cdcd90713 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-20  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/autogen.sh: Check for autoconf2.13, and abort if not
+       found.
+
 2002-05-20  Han-Wen  <hanwen@cs.uu.nl>
 
        * lily/note-head.cc (internal_brew_molecule): warn if note head

diff --git a/autogen.sh b/autogen.sh
index cc6418a5b12a66d08a7661e85599f9d65c04b8a6..99c803624014337eb1c75b7a3af2986c2427fb01 100755 (executable)
--- 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 db1218f170c26810184e2391821cd344f35346f4..5048ce8b21290207478ee55f613320253a6cbaca 100755 (executable)
--- 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"