[PATCH] Fix Autoconf version required by Automake's configure.

[Stefano Lattarini]

Hello automakers.

Apparently, Automake configure script tells that automake requires
autoconf 2.60 or later, but then it checks for autoconf  >= 2.62, and
if it is not found it aborts saying that automake requires configure
2.61a-341 or later.  The attached patch should fix this.

Regards,
     Stefano

From 7a31be021c72632339be6dc005022e6d4dd95330 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 30 Apr 2010 16:52:28 +0200
Subject: [PATCH] Fix Autoconf version required by Automake's configure.

Automake configure script used to tell that automake required
autoconf 2.60 or later, but then it checked for autoconf >= 2.62,
and if that was not found, it gave an error saying that Automake
required configure 2.61a-341 or later.  This change should
eliminate such inconsistencies.

* configure.ac ($required_autoconf_version): New variable.
Use it throughout.
---
 ChangeLog    |   11 +++++++++++
 configure    |    7 ++++---
 configure.ac |    8 +++++---
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 71b0d9b..9e8d8eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-04-30  Stefano Lattarini  <address@hidden>
+
+       Fix Autoconf version required by Automake's configure.
+       Automake configure script used to tell that automake required
+       autoconf 2.60 or later, but then it checked for autoconf >= 2.62,
+       and if that was not found, it gave an error saying that Automake
+       required configure 2.61a-341 or later.  This change should
+       eliminate such inconsistencies.
+       * configure.ac ($required_autoconf_version): New variable.
+       Use it throughout.
+
 2010-04-25  Ralf Wildenhues  <address@hidden>
 
        Warning and error message formatting cleanups.
diff --git a/configure b/configure
index 6bb1f12..2637fe3 100755
--- a/configure
+++ b/configure
@@ -2419,6 +2419,7 @@ HELP2MAN=${HELP2MAN-"${am_missing_run}help2man"}
 # following tests, but some users were unable to figure out that their
 # installation was broken since --version appeared to work.
 
+required_autoconf_version=2.62
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether autoconf is 
installed" >&5
 $as_echo_n "checking whether autoconf is installed... " >&6; }
 if test "${am_cv_autoconf_installed+set}" = set; then :
@@ -2438,7 +2439,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_installed" >&5
 $as_echo "$am_cv_autoconf_installed" >&6; }
 if test "$am_cv_autoconf_installed" = no; then
-  as_fn_error "Autoconf 2.60 or better is required.
+  as_fn_error "Autoconf $required_autoconf_version or better is required.
     Please make sure it is installed and in your PATH." "$LINENO" 5
 fi
 
@@ -2474,7 +2475,7 @@ if test "${am_cv_autoconf_version+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   mkdir conftest
-echo 'AC''_PREREQ([2.62])' > conftest/conftest.ac
+echo 'AC'"_PREREQ([$required_autoconf_version])" > 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=$?
@@ -2490,7 +2491,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_version" >&5
 $as_echo "$am_cv_autoconf_version" >&6; }
 if test "$am_cv_autoconf_version" = no; then
-  as_fn_error "Autoconf 2.61a-341 or better is required." "$LINENO" 5
+  as_fn_error "Autoconf $required_autoconf_version or better is required." 
"$LINENO" 5
 fi
 
 # Test for ln.  We need use it to install the versioned binaries.
diff --git a/configure.ac b/configure.ac
index 9f8eabe..74f4543 100644
--- a/configure.ac
+++ b/configure.ac
@@ -100,6 +100,7 @@ AM_MISSING_PROG([HELP2MAN], [help2man])
 # following tests, but some users were unable to figure out that their
 # installation was broken since --version appeared to work.
 
+required_autoconf_version=2.62
 AC_CACHE_CHECK([whether autoconf is installed], [am_cv_autoconf_installed],
 [if AM_RUN_LOG([eval $am_AUTOCONF --version]);
 then
@@ -108,7 +109,7 @@ else
   am_cv_autoconf_installed=no
 fi])
 if test "$am_cv_autoconf_installed" = no; then
-  AC_MSG_ERROR([Autoconf 2.60 or better is required.
+  AC_MSG_ERROR([Autoconf $required_autoconf_version or better is required.
     Please make sure it is installed and in your PATH.])
 fi
 
@@ -129,7 +130,8 @@ fi
 
 AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version],
 [mkdir conftest
-echo 'AC''_PREREQ([[2.62]])' > conftest/conftest.ac
+dnl Creative quoting required to avoid spurious expansion of AC_PREREQ macro
+echo 'AC'"_PREREQ([[$required_autoconf_version]])" > conftest/conftest.ac
 if AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]);
 then
   am_cv_autoconf_version=yes
@@ -138,7 +140,7 @@ else
 fi
 rm -rf conftest])
 if test "$am_cv_autoconf_version" = no; then
-  AC_MSG_ERROR([Autoconf 2.61a-341 or better is required.])
+  AC_MSG_ERROR([Autoconf $required_autoconf_version or better is required.])
 fi
 
 # Test for ln.  We need use it to install the versioned binaries.
-- 
1.6.5