From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 18 Jan 2011 13:00:44 +0000 (+0100)
Subject: Merge branch 'fix-perl-local-uscore' into warns-win-over-strictness
X-Git-Tag: ng-0.5a~247^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f20b389a8b3a9378164b57e5681bb0dcf74dc8bc;p=thirdparty%2Fautomake.git

Merge branch 'fix-perl-local-uscore' into warns-win-over-strictness

* fix-perl-local-uscore:
  Avoid local $_ perl variable, for Perl before 5.9.1.
---

f20b389a8b3a9378164b57e5681bb0dcf74dc8bc
diff --cc ChangeLog
index 8d335fe3e,8a8f3dd2f..c74676470
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,39 -1,12 +1,46 @@@
+ 2011-01-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Avoid local $_ perl variable, for Perl before 5.9.1.
+ 	* lib/Automake/Options.pm (_process_option_list): Do not
+ 	lexically localize $_.  Fixes bootstrap on AIX 5.1.
+ 	Bug introduced in commit `v1.11-622-gf90a06c'.
+ 
  2011-01-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
 +	Update docs w.r.t. warning and strictness options.
 +	* doc/automake.texi (Strictness): Document that some warnings are
 +	turned off by default in `foreign' strictness.
 +	(Options): Divide into new sections "Options generalities" and
 +	"List of Automake options".  Fix typo (colon instead of full
 +	stop).  Document option precedence (AUTOMAKE_OPTIONS wins over
 +	AM_INIT_AUTOMAKE which wins over command line).  Also document
 +	interactions between options specifying strictness and those
 +	specifying warnings.
 +
 +	More tests on warnings/strictness precedence.
 +	* tests/warning-groups-win-over-strictness.test: New test, similar
 +	to `warnings-win-over-strictness.test', but checking the explicit
 +	catch-all warning flags (like `-Wall' and `-Wnone').
 +	* tests/Makefile.am (TESTS): Update.
 +
 +	Update NEWS about the warnings-over-strictness precedence.
 +	* NEWS: Automake explicit warning levels always take precedence
 +	over the implicit warning levels implied by Automake strictness.
 +
 +	For PR automake/547:
 +	Warnings win over strictness in AUTOMAKE_OPTIONS.
 +	Ensure that, for what concerns the options specified in
 +	AUTOMAKE_OPTIONS, explicitly-defined warnings always take
 +	precedence over implicit strictness-implied warnings.
 +	This finally fixes Automake bug#7669 a.k.a. PR/547.
 +	* automake.in (handle_options): Call 'process_option_list'
 +	only once per set of options.
 +	* lib/Automake/Options.pm (process_global_option_list,
 +	process_option_list): Add sanity checks.
 +	($_options_processed, $_global_options_processed): New
 +	internal variables, used by the sanity checks above.
 +	* tests/warnings-win-over-strictness.test: Extend.
 +
  	For PR automake/547:
  	Change signature of 'Automake::Options::_process_option_list()'.
  	This only modifies internal details in the automake implementation,