From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 20 Apr 2010 05:47:11 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~427
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcad1df725e0a143bd3e8e2f340961145d33b82a;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

fcad1df725e0a143bd3e8e2f340961145d33b82a
diff --cc ChangeLog
index d7f3c2363,97e03ecec..a026c84cc
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,56 -1,47 +1,98 @@@
+ 2010-04-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Fix -Werror handling for presence of configure.in and configure.ac.
+ 	* lib/Automake/Variable.pm (Automake::Variable): Do not initialize
+ 	$configure_ac at the global level, before command-line arguments
+ 	have been parsed.
+ 	(require_variables): Initialize it here.
+ 	* tests/configure.test: New test.
+ 	* tests/Makefile.am: Update.
+ 	Report by Stefano Lattarini.
+ 
+ 2010-04-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Avoid possible false negatives in confh5.test.
+ 	* tests/confh5.test: Enable shell `errexit' flag, and bumped
+ 	copyright years.  Due to this change, any unexpected failure
+ 	in calls to $ACLOCAL, $AUTOMAKE, $AUTOCONF or $AUTOHEADER, or
+ 	a failure in grepping expected text in output files should now
+ 	cause the whole test to fail.
+ 
+ 2010-04-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Fixed typo in POD documentation of Automake::Channels.
+ 	* lib/Automake/Channels.pm: Fixed typo in POD documentation:
+ 	@<...> was used instead of C<...>.
+ 
+ 2010-04-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Refactor tests on Automake TESTS color output.
+ 	* tests/color.test: Tests using the expect program moved out to...
+ 	* tests/color2.test: ... this new file.
+ 	* tests/Makefile.am (TESTS): Extended accordingly.
+ 
+ 2010-04-12  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Fix typos in comments in test confh5.test
+ 	* tests/confh5.test: Fix a couple of typos in comments.
+ 
+ 	Avoid possible false negatives in canon-name.test.
+ 	* tests/canon-name.test: Enable shell `errexit' flag.  Improve
+ 	test description.
+ 
  2010-04-11  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
 +	Print 'warnings are treated as errors' note if needed.
 +	* lib/Automake/Channels.pm: Fix typo in comment.
 +	(_print_message): If -Werror is enabled, print a 'warnings are
 +	treated as errors' note before the first such warning.
 +	* tests/warnopts.test: Adjust comment to mention expected warning.
 +	Adjust code to ignore 'warnings are treated as errors' note.
 +	* tests/location.test: Adjust expected output with -Werror.
 +	* tests/werror4.test: New test.
 +	* tests/Makefile.am: Update.
 +	* NEWS: Update.
 +
 +	Ensure we don't print 'warning:' or 'error:' twice.
 +	* Makefile.am (sc_ensure_testsuite_has_run): New helper rule.
 +	(sc_tests_logs_duplicate_prefixes): New rule, to check for
 +	wrong-looking warning and error messages in the test suite logs.
 +	* aclocal.in (scan_configure_dep, scan_file): Remove duplicate
 +	`warning: ' prefix.
 +	* tests/vars3.test: Rename variable to avoid false positive.
 +
 +	Prepend type to warning, error, and fatal messages.
 +	For the first part of messages of types `error' or `fatal',
 +	prepend `error: ' to the message.  Prepend `warning: ' to
 +	warning messages, whatever the setting of -Werror.
 +	* lib/Automake/Channels.pm (partial): Move up definition.
 +	(_format_message): Emit `header' and `footer' strings only with
 +	the first resp. last part of a set of partial messages.
 +	* lib/Automake/ChannelDefs.pm: Add missing '1;' statement at the
 +	end of the module.
 +	(Automake::ChannelDefs): Setup warning channels with header
 +	`warning: ', error and fatal messages with header `error: '.
 +	* tests/condinc2.test, tests/ltinstloc.test: Adjust expected
 +	error messages.
 +	* tests/comment5.test: Likewise.  Also, include stack notes
 +	should not start with `error:'.
 +	* tests/location.test: Likewise.  Also, try both -Werror and
 +	-Wno-error.
 +	* NEWS: Update.
 +	Report by Bruno Haible.
 +
 +	Fix capitalization of error messages, reword one message.
 +	* lib/Automake/Variable.pm (define): Do not capitalize the first
 +	word in the error message.
 +	* automake.in (require_file_internal): Likewise.  Also, reword
 +	and line-wrap for better readability.
 +	* tests/distcom7.test, tests/pluseq5.test, tests/pluseq9.test:
 +	Adjust tests.
 +
 +	Fix connected warnings about obsolete exeext override.
 +	* lib/Automake/Rule.pm (define): Merge two warnings that belong
 +	together, by setting the 'partial' flag for the first one.
 +
  	Fix per-Makefile.am setting of -Werror.
  	Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one
  	Makefile.am would carry over to other Makefile.am files