From ced754971f39126c68dcce40055a1f47d4c6fd14 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 10 Apr 2008 16:47:55 -0600 Subject: [PATCH] Prefer a released version of autoconf. * NEWS: Bump requirement to autoconf 2.62. * m4/init.m4 (AM_INIT_AUTOMAKE): Likewise. * configure.ac: Likewise. (AC_PREREQ): Remove check, done by AM_INIT_AUTOMAKE instead. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ NEWS | 2 +- aclocal.m4 | 4 ++-- configure | 45 +++++++++++++++++++++++++++++---------------- configure.ac | 4 +--- m4/amversion.m4 | 4 ++-- m4/init.m4 | 26 +++++++++++++------------- tests/Makefile.in | 1 + 8 files changed, 55 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84df434..e134e4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-04-10 Eric Blake + Prefer a released version of autoconf. + * NEWS: Bump requirement to autoconf 2.62. + * m4/init.m4 (AM_INIT_AUTOMAKE): Likewise. + * configure.ac: Likewise. + (AC_PREREQ): Remove check, done by AM_INIT_AUTOMAKE instead. + AC_AUTOCONF_VERSION can inadvertently expand to a macro name. * m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Use proper m4 quoting. diff --git a/NEWS b/NEWS index 72081f1..4230abb 100644 --- a/NEWS +++ b/NEWS @@ -2,7 +2,7 @@ New in 1.10a: * Version requirements: - - Autoconf 2.61a-341 or greater is required. + - Autoconf 2.62 or greater is required. * Changes to aclocal: diff --git a/aclocal.m4 b/aclocal.m4 index c6a3930..16f8a30 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(AC_AUTOCONF_VERSION, [2.61a.379-fd8b],, -[m4_warning([this file was generated for autoconf 2.61a.379-fd8b. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.62],, +[m4_warning([this file was generated for autoconf 2.62. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) diff --git a/configure b/configure index 08f7586..a6ded56 100755 --- a/configure +++ b/configure @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61a.379-fd8b for GNU Automake 1.10a. +# Generated by GNU Autoconf 2.62 for GNU Automake 1.10a. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -1373,10 +1373,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF GNU Automake configure 1.10a -generated by GNU Autoconf 2.61a.379-fd8b +generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1387,7 +1387,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by GNU Automake $as_me 1.10a, which was -generated by GNU Autoconf 2.61a.379-fd8b. Invocation command line was +generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -1683,13 +1683,22 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { $as_echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -$as_echo "$as_me: former value: $ac_old_val" >&2;} - { $as_echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -$as_echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. @@ -2476,7 +2485,7 @@ if test "${am_cv_autoconf_version+set}" = set; then $as_echo_n "(cached) " >&6 else mkdir conftest -echo 'AC''_PREREQ(2.61a-341)' > conftest/conftest.ac +echo 'AC''_PREREQ([2.62])' > 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=$? @@ -3200,7 +3209,7 @@ exec 6>&1 # values after options handling. ac_log=" This file was extended by GNU Automake $as_me 1.10a, which was -generated by GNU Autoconf 2.61a.379-fd8b. Invocation command line was +generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -3243,10 +3252,10 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ GNU Automake config.status 1.10a -configured by $0, generated by GNU Autoconf 2.61a.379-fd8b, +configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2007 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -3532,7 +3541,11 @@ cat >>"\$tmp/subs1.awk" <<_ACAWK && _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 $as_echo "$as_me: error: could not setup config files machinery" >&2;} { (exit 1); exit 1; }; } diff --git a/configure.ac b/configure.ac index 5198d9e..08e9f41 100644 --- a/configure.ac +++ b/configure.ac @@ -16,8 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -dnl Require Autoconf 2.60 for AC_REQUIRE_AUX_FILE. -AC_PREREQ(2.60) AC_INIT([GNU Automake], [1.10a], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR(automake.in) @@ -100,7 +98,7 @@ fi AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version], [mkdir conftest -echo 'AC''_PREREQ(2.61a-341)' > conftest/conftest.ac +echo 'AC''_PREREQ([[2.62]])' > conftest/conftest.ac if AM_RUN_LOG([cd conftest && eval $am_AUTOCONF -o /dev/null conftest.ac]); then am_cv_autoconf_version=yes diff --git a/m4/amversion.m4 b/m4/amversion.m4 index b114980..33230d4 100644 --- a/m4/amversion.m4 +++ b/m4/amversion.m4 @@ -1,6 +1,6 @@ ## -*- Autoconf -*- ## Generated from amversion.in; do not edit by hand. -# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -34,4 +34,4 @@ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.10a])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff --git a/m4/init.m4 b/m4/init.m4 index 1f5c437..7104dd3 100644 --- a/m4/init.m4 +++ b/m4/init.m4 @@ -7,7 +7,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 14 +# serial 15 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -24,7 +24,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.61a-341])dnl +[AC_PREREQ([2.62])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -84,21 +84,21 @@ AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) diff --git a/tests/Makefile.in b/tests/Makefile.in index de5d003..1ba9947 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -539,6 +539,7 @@ missing2.test \ missing3.test \ missing4.test \ missing5.test \ +missing6.test \ mkinstall.test \ mkinst2.test \ mkinst3.test \ -- 2.7.4