From: Jim Meyering <meyering@redhat.com>
Date: Wed, 6 Jan 2010 09:14:23 +0000 (+0100)
Subject: build: require newer versions of automake and autoconf
X-Git-Tag: v8.3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f52d939014ba482473946ca40104e1fdabda5c53;p=thirdparty%2Fcoreutils.git

build: require newer versions of automake and autoconf

* configure.ac: Require autoconf-2.62 and automake-1.11.1 or newer.
* bootstrap.conf (buildreq): Require automake-1.11.1 or newer,
to ensure people use a version with the fix for CVE-2009-4029.
Note that the coreutils-8.2 tarball included a fixed Makefile.in.
Require autoconf-2.62, per automake.
---

diff --git a/bootstrap.conf b/bootstrap.conf
index 15b8912594..9cdf984ba0 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -310,8 +310,8 @@ gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
 
 # Build prerequisites
 buildreq="\
-autoconf   2.61
-automake   1.11
+autoconf   2.62
+automake   1.11.1
 autopoint  -
 bison      -
 gettext    -
diff --git a/configure.ac b/configure.ac
index a6b9a02fc5..b07a52bf51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
 
 dnl Written by Jim Meyering.
 
-AC_PREREQ([2.61])
+AC_PREREQ([2.62])
 
 # Make inter-release version strings look like, e.g., v6.9-219-g58ddd, which
 # indicates that it is built from the 219th delta (in _some_ repository)
@@ -32,7 +32,7 @@ AC_CONFIG_SRCDIR([src/ls.c])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([lib/config.h:lib/config.hin])
 
-AM_INIT_AUTOMAKE([1.11 dist-xz color-tests parallel-tests])
+AM_INIT_AUTOMAKE([1.11.1 dist-xz color-tests parallel-tests])
 AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
 
 AC_PROG_CC_STDC