diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2010-04-30 16:52:28 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-05-23 16:44:04 +0200 |
| commit | 6491203472057e9314bf654d3874a21b80771ea0 (patch) | |
| tree | 157bda67772d92eff03021df67caacc18d6c46fa /configure.ac | |
| parent | 4f1334cfd89878c1dc0eb9fd01d4ca08543ade9a (diff) | |
| download | automake-6491203472057e9314bf654d3874a21b80771ea0.tar.gz | |
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.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 759952dde..8592fbdf8 100644 --- 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, -# 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2004, 2006, 2007, 2008, 2009, 2010 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 @@ -99,6 +99,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 @@ -107,7 +108,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 @@ -128,7 +129,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 @@ -137,7 +139,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. |