[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-661-g80d2f4a

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=80d2f4a1904586949a91228ee811b1470de820ff

The branch, master has been updated
       via  80d2f4a1904586949a91228ee811b1470de820ff (commit)
       via  c4c1aa2d708ceb4c0f245a91a0e28a1ddff16c2f (commit)
      from  5fa4dafb2a0b8fc8133697526a869cecccfeceed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 80d2f4a1904586949a91228ee811b1470de820ff
Merge: 5fa4daf c4c1aa2
Author: Ralf Wildenhues <address@hidden>
Date:   Mon Jan 17 07:43:59 2011 +0100

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

commit c4c1aa2d708ceb4c0f245a91a0e28a1ddff16c2f
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jan 16 23:00:35 2011 +0100

    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'.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog               |    7 +++++++
 lib/Automake/Options.pm |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1cc161b..80a51b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-17  Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
 
        tests: remove useless requirements from cond36.test
diff --git a/lib/Automake/Options.pm b/lib/Automake/Options.pm
index 31052c0..778167a 100644
--- a/lib/Automake/Options.pm
+++ b/lib/Automake/Options.pm
@@ -260,7 +260,7 @@ sub _process_option_list (\%@)
 
   foreach my $h (@list)
     {
-      my $_ = $h->{'option'};
+      local $_ = $h->{'option'};
       my $where = $h->{'where'};
       $options->{$_} = $where;
       if ($_ eq 'gnits' || $_ eq 'gnu' || $_ eq 'foreign')


hooks/post-receive
-- 
GNU Automake