From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 2 Jan 2011 04:38:18 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c9e7acc221607e2bfd9121eaccb39b465c8cbc5;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

3c9e7acc221607e2bfd9121eaccb39b465c8cbc5
diff --cc ChangeLog
index 56aa429fc,10b588d50..ce5873b08
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,39 -1,14 +1,50 @@@
+ 2011-01-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Fix maintainer-check regression.
+ 	* tests/subobj11a.test: Pass DISTCHECK_CONFIGURE_FLAGS in the
+ 	environment.
+ 
+ 	Bump copyright years.
+ 	* aclocal.in (write_aclocal, version): Bump copyright years.
+ 	* automake.in (gen_copyright, version): Likewise.
+ 	* doc/automake.texi: Likewise.
+ 
 +2010-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	* NEWS: Add missing blank line between two entries.
 +
 +2010-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Improve and extend tests `suffix*.test'.
 +	* tests/suffix.test: Check that suffix rules for C compilation are
 +	only included once.  Try also with a static library.
 +	* tests/suffix2.test: Add a new grep to help potential debugging.
 +	Do not run automake with the `--add-missing' options, since we
 +	already create all the needed auxiliary files.  Try also *without*
 +	the `no-dependencies' automake option.
 +	* tests/suffix4.test: Make grepping of Makefile.in stricter.
 +	* tests/suffix3.test: Rewritten to run also autoconf, ./configure
 +	and make.
 +	* tests/suffix5.test: Likewise.
 +	* tests/suffix6.test: Fix botched recipe indentation (eight spaces
 +	were used instead of a tabulation character).  Extend to check
 +	that `.obj' is handled like `.$(OBJEXT)' (as is done for `.o').
 +	Improved parsing & grepping of generated Makefile.in.  Other minor
 +	fixes and improvements.
 +	* tests/suffix10.test: Move some checks in Makefile.am.  Also run
 +	"make all".
 +	* tests/suffix12.test: Likewise, and account for VPATH issues in
 +	weaker make implementations.
 +	* tests/suffix11.test: Likewise.  Also, run "make distcheck", for
 +	completeness, and related changes.
 +	* tests/suffix8.test: Likewise.  Also, do not put `gcc' anymore
 +	in $required.
 +	* tests/suffix13.test: Do not use the `--force-missing' automake
 +	option unnecessarily.
 +	* tests/suffix6b.test: New test, semantic sister of `suffix6.test'.
 +	* tests/suffix6c.test: Likewise.
 +	* tests/Makefile.am (TESTS): Updated.
 +
  2010-12-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  	    Stefano Lattarini  <stefano.lattarini@gmail.com>
  
diff --cc aclocal.m4
index c43a36843,f60cbdb94..068c1e85b
--- a/aclocal.m4
+++ b/aclocal.m4
@@@ -1,7 -1,8 +1,8 @@@
 -# generated automatically by aclocal 1.11 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11a -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+ # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+ # Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
diff --cc automake.in
index bb30c738b,fa110a5d2..57edd0419
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in