Re: Automake bug fixed
Eric Blake <[email protected]>
| Newsgroups | gmane.comp.gnu.m4.patches |
|---|---|
| Message-ID | <[email protected]> |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 According to Eric Blake on 1/22/2008 8:19 AM: | Automake 1.10.1 is now out, so I will be applying your patch today, along with | an update to HACKING and configure.ac to make the dependency obvious. Here's what I committed. Note that running 'make dist' now requires lzma with a gzip-like interface (from lzma-utils, or see how debian merged lzma-utils with the newer lzma SDK from 7zip, sinze 7zip's lzma interface is lousy). - -- Don't work too hard, make some time for fun as well! Eric Blake [email protected] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (Cygwin) Comment: Public key at home.comcast.net/~ericblake/eblake.gpg Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFHllaW84KuGfSFAYARAswCAJ9/ea42deoOFk0bsRhRpAjOnQxIigCff/AL REaefA/g140k7oeCqEfv2A0= =JmQ+ -----END PGP SIGNATURE----- _______________________________________________ M4-patches mailing list [email protected] http://lists.gnu.org/mailman/listinfo/m4-patches
m4.patch310
(text/plain, 6.8 KB)
From bf389f4092e0b674a521291b2c6f5862fd14072f Mon Sep 17 00:00:00 2001 From: Eric Blake <[email protected]> Date: Tue, 22 Jan 2008 13:35:00 -0700 Subject: [PATCH] Rely on newer automake. * configure.ac (AM_INIT_AUTOMAKE): Require 1.10.1, and add lzma distribution. * bootstrap: Update automake requirement. (func_version): Fix --version output, broken since 2007-08-06. * HACKING: Likewise. Add lzma requirement. * Makefile.am (clean-local-src): Not needed any more with newest Automake. (clean-local): Adjust. * TODO: Remove completed item. Signed-off-by: Eric Blake <[email protected]> --- ChangeLog | 14 ++++++++++++++ HACKING | 7 ++++--- Makefile.am | 13 +++---------- TODO | 3 --- bootstrap | 15 +++++++++------ configure.ac | 4 ++-- 6 files changed, 32 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15589bb..b911528 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2008-01-22 Ralf Wildenhues <[email protected]> + and Eric Blake <[email protected]> + + Rely on newer automake. + * configure.ac (AM_INIT_AUTOMAKE): Require 1.10.1, and add lzma + distribution. + * bootstrap: Update automake requirement. + (func_version): Fix --version output, broken since 2007-08-06. + * HACKING: Likewise. Add lzma requirement. + * Makefile.am (clean-local-src): Not needed any more with newest + Automake. + (clean-local): Adjust. + * TODO: Remove completed item. + 2008-01-22 Eric Blake <[email protected]> Doc tweak. diff --git a/HACKING b/HACKING index d9b978b..f81dd05 100644 --- a/HACKING +++ b/HACKING @@ -65,10 +65,11 @@ and is not part of a release distribution. - A pre-installed version of GNU M4 1.4.5 or later, built from a package - Autoconf 2.60 or later - - Automake 1.10a or later + - Automake 1.10.1 or later - CVS Head of Libtool (will become Libtool 2.0) - Gettext 0.16 or later - Help2man 1.29 or later + - LZMA Utils 4.32 or later (from <http://tukaani.org/lzma/>) - Texinfo 4.8 or later - Any prerequisites of the above (such as perl, tex) - A git checkout of gnulib. A read-only copy of gnulib can be @@ -234,7 +235,7 @@ yyyy-mm-dd Name of Author <email@address> (tiny change) * Run 'make deltas' (pass LASTRELEASE=maj.min[.mic[alpha]] if needed) to create both diff and xdelta files between the previous release tarball - and the new. + and the new. TODO - is xdelta still worth using? * Run '[../]./gnupload --to [dest].gnu.org:m4 [files]' to create detached gpg signature and clear signed directive files, and upload @@ -429,7 +430,7 @@ issue. -- -Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. The canonical source of this file is maintained with the GNU M4 package. Report bugs to [email protected]. diff --git a/Makefile.am b/Makefile.am index 49db5ef..e79210c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ ## Makefile.am - template for generating Makefile via Automake ## -## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software -## Foundation, Inc. +## Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free +## Software Foundation, Inc. ## ## This file is part of GNU M4. ## @@ -86,13 +86,6 @@ src_m4_LDFLAGS = $(AM_LDFLAGS) $(DLPREOPEN) src_m4_LDADD = m4/libm4.la src_m4_DEPENDENCIES = $(PREOPEN_DEPENDENCIES) m4/libm4.la -## Since we do not build a libtool library in src, Automake fails to infer -## that there may be a libs directory there. FIXME - revisit this if -## automake 1.10 fixes the bug. -clean-local-src: - -rm -rf src/.libs src/_libs - - ## ## ## --- PASTED MANUALLY FROM GNULIB --- ## ## To avoid adding unnecessary objects to libm4.la these gnulib ## @@ -441,7 +434,7 @@ OTHER_FILES = tests/iso8859.m4 tests/stackovf.test \ DISTCLEANFILES += tests/atconfig tests/atlocal tests/m4 MAINTAINERCLEANFILES += tests/generated.at '$(TESTSUITE)' -clean-local: clean-local-src clean-local-tests +clean-local: clean-local-tests ## ## ## --- RULES FOR THE MAINTAINER --- ## diff --git a/TODO b/TODO index 78ee259..f138dd2 100644 --- a/TODO +++ b/TODO @@ -132,9 +132,6 @@ for any of these ideas or if you have others to add. * OTHER TOOLS - + Automake 1.11 will allow some Makefile.am cleanups: - http://lists.gnu.org/archive/html/m4-patches/2007-08/msg00008.html - + Copy coreutils' idea of using rsync, not wget, for grabbing .po files efficiently. diff --git a/bootstrap b/bootstrap index 140ed0e..8da38fd 100755 --- a/bootstrap +++ b/bootstrap @@ -1,9 +1,12 @@ #! /bin/sh -# bootstrap (GNU M4) version 2007-11-05 -# Written by Gary V. Vaughan <[email protected]> +# bootstrap (GNU M4) version 2008-01-22 +# 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. +# There is NO WARRANTY, to the extent permitted by law. -# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Written by Gary V. Vaughan <[email protected]> # This file is part of GNU M4. # @@ -37,7 +40,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.60 or better, GNU M4 1.4.x or -# better, a git snapshot of Automake 1.10a or better, a CVS snapshot +# better, a git snapshot of Automake 1.10.1 or better, a CVS snapshot # of Libtool 2.1a 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 @@ -175,8 +178,8 @@ func_help () # Echo version message to standard output and exit. func_version () { - $SED '/^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# //; s/^# *$//; + $SED '/^# '$PROGRAM' (GNU /,/# Written by / { + s/^# //; s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/; p; }; d' < "$progpath" diff --git a/configure.ac b/configure.ac index d9790e9..bf2b5ff 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Configure template for GNU m4. -*-Autoconf-*- # Copyright (C) 1991, 1992, 1993, 1994, 2000, 2001, 2002, 2004, 2005, 2006, -# 2007 Free Software Foundation, Inc. +# 2007, 2008 Free Software Foundation, Inc. # # This file is part of GNU M4. # @@ -66,7 +66,7 @@ M4_default_preload="M4_DEFAULT_PRELOAD" ## ------------------------ ## ## Automake Initialization. ## ## ------------------------ ## -AM_INIT_AUTOMAKE([1.10a subdir-objects dist-bzip2 gnits]) +AM_INIT_AUTOMAKE([1.10.1 subdir-objects dist-bzip2 dist-lzma gnits]) -- 1.5.3.8