diff options
author | Eric Blake <ebb9@byu.net> | 2008-07-11 07:43:03 -0600 |
---|---|---|
committer | Eric Blake <ebb9@byu.net> | 2008-07-11 07:43:03 -0600 |
commit | 3f65aa84e013948949e674e3970b5569383e7455 (patch) | |
tree | b871dac5b9f049bbeb1cc1865184b6508bfa8561 | |
parent | 46b57220ee19890aea59e790c7e03f7291f13f07 (diff) | |
download | m4-3f65aa84e013948949e674e3970b5569383e7455.tar.gz |
Bump required automake to 1.10a; regression introduced 2008-01-22.
* configure.ac (AM_INIT_AUTOMAKE): Undo requirement downgrade to
1.10.1, since we also rely on pkglibexecdir.
* HACKING: Fix minimum requirement.
* bootstrap: Likewise.
* THANKS: Update.
Reported by Joel E. Denny.
Signed-off-by: Eric Blake <ebb9@byu.net>
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | HACKING | 2 | ||||
-rw-r--r-- | THANKS | 1 | ||||
-rwxr-xr-x | bootstrap | 4 | ||||
-rw-r--r-- | configure.ac | 2 |
5 files changed, 13 insertions, 4 deletions
@@ -1,5 +1,13 @@ 2008-07-11 Eric Blake <ebb9@byu.net> + Bump required automake to 1.10a; regression introduced 2008-01-22. + * configure.ac (AM_INIT_AUTOMAKE): Undo requirement downgrade to + 1.10.1, since we also rely on pkglibexecdir. + * HACKING: Fix minimum requirement. + * bootstrap: Likewise. + * THANKS: Update. + Reported by Joel E. Denny. + Avoid bogus whitespace in @ovar, @dvar. * doc/m4.texinfo (ovar, dvar): Add @c. Based on patch by Ralf Wildenhues to Autoconf manual. @@ -65,7 +65,7 @@ and is not part of a release distribution. - A pre-installed version of GNU M4 1.4.5 or later, built from a package (recommend 1.4.11 or later) - Autoconf 2.62 or later - - Automake 1.10.1 or later + - Automake 1.10a or later - Libtool 2.2 or later - Gettext 0.16 or later - Gperf 3.0 or later @@ -65,6 +65,7 @@ Jean-Charles Longuet jclonguet@free.fr Jim Avera jima@netcom.com Jim Kingdom kingdon@cygnus.com Jim Meyering meyering@acm.org +Joel E. Denny jdenny@ces.clemson.edu Joel Sherrill jsherril@uahcs2.cs.uah.edu John Brzustowski jbrzusto@fastmail.fm John David Anglin dave@hiauly1.hia.nrc.ca @@ -1,6 +1,6 @@ #! /bin/sh -# bootstrap (GNU M4) version 2008-06-23 +# bootstrap (GNU M4) version 2008-07-11 # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> # This is free software: you are free to change and redistribute it. @@ -37,7 +37,7 @@ # This script bootstraps a git or CVS checkout of GNU M4 by correctly calling # out to parts of the GNU Build Platform. Currently this requires GNU # Gettext 0.16 or better, Autoconf 2.62 or better, GNU M4 1.4.5 or better, -# Automake 1.10.1 or better, Libtool 2.2 or better, +# the latest git Automake 1.10a or better, Libtool 2.2 or better, # and the latest git or CVS checkout of Gnulib. # Libtool must be installed; either with the same --prefix as # automake, or made accessible to aclocal's search path via diff --git a/configure.ac b/configure.ac index 8591b615..1aa9397a 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,7 @@ M4_default_preload="M4_DEFAULT_PRELOAD" ## ------------------------ ## ## Automake Initialization. ## ## ------------------------ ## -AM_INIT_AUTOMAKE([1.10.1 subdir-objects dist-bzip2 dist-lzma] +AM_INIT_AUTOMAKE([1.10a subdir-objects dist-bzip2 dist-lzma] m4_bmatch(m4_defn([M4_VERSION]), [-], [gnu], [gnits])) |