* configure.ac: Actually require version 2.60 in the test for

Autoconf, and recommend it in the error messages.
* THANKS: Update.
Report by Robert Swafford.

diff --git a/ChangeLog b/ChangeLog
index 27eb20cab33ffe81015402449c25df49567e75d5..e3d17d245678ddee3cabc3406991f0dce248adfc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * configure.ac: Actually require version 2.60 in the test for
+       Autoconf, and recommend it in the error messages.
+       * THANKS: Update.
+       Report by Robert Swafford.
+
 2007-07-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/automake.texi (VPATH Builds): Fix wording.

diff --git a/THANKS b/THANKS
index 7a4a71b2e2aff3e9c9e5434000408af31da55ba9..1344bdf61ab1078479adf0e00fd3dd6f13c34855 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -259,6 +259,7 @@ Rob Savoye          rob@cygnus.com
 Robert Bihlmeyer       robbe@orcus.priv.at
 Robert Boehne          rboehne@ricardo-us.com
 Robert Collins         robert.collins@itdomain.com.au
+Robert Swafford                robert.swafford@l-3com.com
 Roberto Bagnara                bagnara@cs.unipr.it
 Roman Fietze           roman.fietze@telemotive.de
 Ronald Landheer                ronald@landheer.com

diff --git a/configure b/configure
index 6d5312e2f71d84635c3b0030ed14163e71a66059..0896601edc9b52283eaf38e6c315a8f239147abb 100755 (executable)
--- a/configure
+++ b/configure
@@ -2341,9 +2341,9 @@ fi
 { echo "$as_me:$LINENO: result: $am_cv_autoconf_installed" >&5
 echo "${ECHO_T}$am_cv_autoconf_installed" >&6; }
 if test "$am_cv_autoconf_installed" = no; then
-  { { echo "$as_me:$LINENO: error: Autoconf 2.58 or better is required.
+  { { echo "$as_me:$LINENO: error: Autoconf 2.60 or better is required.
     Please make sure it is installed and in your PATH." >&5
-echo "$as_me: error: Autoconf 2.58 or better is required.
+echo "$as_me: error: Autoconf 2.60 or better is required.
     Please make sure it is installed and in your PATH." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2383,7 +2383,7 @@ if test "${am_cv_autoconf_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   mkdir conftest
-echo 'AC''_PREREQ(2.58)' > conftest/conftest.ac
+echo 'AC''_PREREQ(2.60)' > conftest/conftest.ac
 if { echo "$as_me:$LINENO: cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac" >&5
    (cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac) >&5 2>&5
    ac_status=$?
@@ -2399,8 +2399,8 @@ fi
 { echo "$as_me:$LINENO: result: $am_cv_autoconf_version" >&5
 echo "${ECHO_T}$am_cv_autoconf_version" >&6; }
 if test "$am_cv_autoconf_version" = no; then
-  { { echo "$as_me:$LINENO: error: Autoconf 2.58 or better is required." >&5
-echo "$as_me: error: Autoconf 2.58 or better is required." >&2;}
+  { { echo "$as_me:$LINENO: error: Autoconf 2.60 or better is required." >&5
+echo "$as_me: error: Autoconf 2.60 or better is required." >&2;}
    { (exit 1); exit 1; }; }
 fi
 

diff --git a/configure.ac b/configure.ac
index 95ce3926665e82e20409ad5180fb27b2dbc84626..8f2ca704e4d543bd75cb3dedb41aad78b7f41f09 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
 # Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006,
-# 2004, 2006  Free Software Foundation, Inc.
+# 2004, 2006, 2007  Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -81,7 +81,7 @@ else
   am_cv_autoconf_installed=no
 fi])
 if test "$am_cv_autoconf_installed" = no; then
-  AC_MSG_ERROR([Autoconf 2.58 or better is required.
+  AC_MSG_ERROR([Autoconf 2.60 or better is required.
     Please make sure it is installed and in your PATH.])
 fi
 
@@ -102,7 +102,7 @@ fi
 
 AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version],
 [mkdir conftest
-echo 'AC''_PREREQ(2.58)' > conftest/conftest.ac
+echo 'AC''_PREREQ(2.60)' > conftest/conftest.ac
 if AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]);
 then
   am_cv_autoconf_version=yes
@@ -111,7 +111,7 @@ else
 fi
 rm -rf conftest])
 if test "$am_cv_autoconf_version" = no; then
-  AC_MSG_ERROR([Autoconf 2.58 or better is required.])
+  AC_MSG_ERROR([Autoconf 2.60 or better is required.])
 fi
 
 # Test for ln.  We need use it to install the versioned binaries.