Merge branch 'fix-perl-local-uscore'

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

diff --cc ChangeLog
index 1cc161b,8a8f3dd..80a51b6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,108 -1,12 +1,115 @@@
+ 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-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: remove useless requirements from cond36.test
 +      * tests/cond36.test ($required): Remove.
 +      Since we are at it, add a trailing `:' command.
 +
 +2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      tests: avoid failing command substitution in errexit mode.
 +      * tests/vartypo2.test, tests/vartypos.test: Rewrite to not use
 +      a command substitution with a nonzero exit status, that causes
 +      IRIX and Tru64/OSF sh to fail the whole test.
 +
 +2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +          Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      parallel-tests: work around Tru64/OSF 5.1 sh read bugs.
 +      * lib/am/check.am ($(TEST_SUITE_LOG), recheck, recheck-html):
 +      Test file readability before redirecting input from it, to avoid
 +      exiting Tru64/OSF 5.1 sh which treats read as special builtin.
 +      * tests/parallel-tests-unreadable-log.test: New test.
 +      * tests/Makefile.am (TESTS): Update.
 +      * NEWS: Update.
 +
 +2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      * NEWS, README: Update copyright years.
 +
 +2011-01-15  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: hard error in case of internal failures or signal caught
 +      * tests/defs: Exit with status 99 (hard error) rather than
 +      1 (failure) on unexpected/internal errors, or when a signal
 +      is caught by the client script.
 +
 +      Tests defs: don't let useless variables leak in test scripts.
 +      * tests/defs ($priv_check_temp, $overwrite_status, $ro_dir_temp,
 +      $create_status, $r2h, $libtool_found, $gettext_found, $aclocaldir,
 +      $extra_includes): Unset once they've served their purpose.
 +
 +2011-01-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix parallel-tests.test failure with HP-UX make.
 +      * tests/parallel-tests.test: Sleep inside inner tests, so logs
 +      are newer than logs of tests they depend on, for HP-UX make.
 +
 +2011-01-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      docs: ensure example are separated with empty lines in the input
 +      * doc/automake.texi (Extending aclocal, Emacs Lisp, Rebuilding)
 +      (API Versioning, Renamed Objects, Multiple Outputs): Add empty
 +      lines before `@example' and after `@end example' lines, so info
 +      output is rendered correctly, and a following @noindent honored.
 +      Report by Stefano Lattarini.
 +
 +2011-01-15  Jim Meyering <meyering@redhat.com>
 +
 +      tests: fix comment typo
 +      * tests/substref.test: Fix grammar in a comment.
 +
 +2011-01-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      tests: fix spurious failures in two texinfo tests
 +      * tests/txinfo.test ($required): Add 'makeinfo'.
 +      * tests/txinfo8.test: Create a dummy 'textutils.info' file, so
 +      that make won't try to run makeinfo (which could be unavailable)
 +      to build it.
 +      Found by NixOS Hydra, reported by Ralf Wildenhues.
 +
  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,

diff --cc lib/Automake/Options.pm
Simple merge