From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 19 Nov 2010 20:24:43 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~330
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f2d21795e8f70399ea27649ca54cc9080f2825a;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

3f2d21795e8f70399ea27649ca54cc9080f2825a
diff --cc ChangeLog
index cd5367cd3,fbc114e19..92b6ffa01
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,18 +1,26 @@@
+ 2010-11-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Automake::Config: remove extra trailing semicolon.
+ 	* lib/Automake/Config.in: Remove extra trailing semicolon.
+ 
+ 	help4.test: fix botched heading comment.
+ 	* tests/help4.test: Fixed the heading comment, since it
+ 	didn't correctly describe what checks the testcase was
+ 	supposed to perform.
+ 
+ 	help2.test: add checks on aclocal too.
+ 	* tests/help2.test: Check that also `aclocal --version' and
+ 	`aclocal --help' work with configure.in and acinclude.m4 both
+ 	broken.
+ 
 +2010-11-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	New test on repeated automake options.
 +	* tests/repeated-options.test: New test, check that automake
 +	does not complain on repeated options, nor generate broken or
 +	incorrect makefiles.
 +	* tests/Makefile.am (TESTS): Updated.
 +
  2010-11-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	Fix spurious failures of silent-rules tests with Sun Fortran.