From 440f0586e336c7f441e1c51237dade20b2d34b22 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 16 Apr 2009 06:46:28 -0600 Subject: Require newer automake features. * configure.ac (AM_INIT_AUTOMAKE): Add dist-xz, color-tests, parallel-tests, and silent-rules. * HACKING: Update minimum requirements. * gnulib: Update to latest version. Signed-off-by: Eric Blake (cherry picked from commit 93b09e692ac2f258717ed800276be4cf1848053c) --- ChangeLog | 6 ++++++ HACKING | 8 ++++---- configure.ac | 8 ++++---- gnulib | 2 +- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 895d1220..4fadd51b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-04-16 Eric Blake + Require newer automake features. + * configure.ac (AM_INIT_AUTOMAKE): Add dist-xz, color-tests, + parallel-tests, and silent-rules. Drop dist-lzma. + * HACKING: Update minimum requirements. + * gnulib: Update to latest version. + Mention release of 1.4.13. * NEWS: Update to match release on branch-1.4. * doc/m4.texinfo (History): Update release history. diff --git a/HACKING b/HACKING index b4099006..ec22cad3 100644 --- a/HACKING +++ b/HACKING @@ -63,14 +63,14 @@ and is not part of a release distribution. * Before you can build from git, you need to bootstrap. This requires: - A pre-installed version of GNU M4 1.4.5 or later, built from a - package (recommend 1.4.11 or later) + package (recommend 1.4.13 or later) - Autoconf 2.62 or later - - Automake 1.10a or later + - Automake 1.10b or later - Libtool 2.2 or later - Gettext 0.16 or later - Gperf 3.0 or later - Help2man 1.29 or later - - LZMA Utils 4.32 or later (from ) + - Xz 4.999.8beta or later (from ) - Texinfo 4.8 or later - Any prerequisites of the above (such as perl, tex) @@ -243,7 +243,7 @@ yyyy-mm-dd Name of Author (tiny change) * Make sure you are happy with the particular gnulib version recorded as the gnulib submodule. If necessary to update to the latest, run: - git submodule foreach git pull + git submodule foreach git pull origin master git commit -m 'Update gnulib submodule to latest.' gnulib * Update the version number in configure.ac. diff --git a/configure.ac b/configure.ac index ec8ff460..d5f186bf 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,7 @@ AC_CONFIG_TESTDIR([tests]) AC_CONFIG_HEADERS([gnu/config.h:gnu/config.hin]) AC_CONFIG_FILES([tests/m4], [chmod +x tests/m4]) + ## -------------------------- ## ## M4 specific configuration. ## ## -------------------------- ## @@ -53,9 +54,9 @@ M4_default_preload="M4_DEFAULT_PRELOAD" ## ------------------------ ## ## Automake Initialization. ## ## ------------------------ ## -AM_INIT_AUTOMAKE([1.10a subdir-objects dist-bzip2 dist-lzma] -m4_bmatch(m4_defn([M4_VERSION]), [-], [gnu], [gnits])) - +AM_INIT_AUTOMAKE([1.10b subdir-objects dist-bzip2 dist-xz +color-tests parallel-tests silent-rules] +m4_if(m4_index(m4_defn([M4_VERSION]), [-]), [-1], [gnits], [gnu])) ## ------------------ ## @@ -70,7 +71,6 @@ AM_PROG_CC_C_O M4_CHECK_DEBUGGING - ## ----------------------- ## ## Libtool initialization. ## ## ----------------------- ## diff --git a/gnulib b/gnulib index 6c410f6d..abb53db0 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 6c410f6d2875a0a41671daab4d9751a74c69c451 +Subproject commit abb53db0ac56280d00b2cb8a67f61caff622ea89 -- cgit v1.2.1