34-name-clash.patch

[Akim Demaille]

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * automake.in (&read_am_file, &file_contents): Avoid name clashed
        on $cond.

Index: automake.in
--- automake.in Sat, 10 Mar 2001 18:48:14 +0100 akim (am/f/39_automake.i 1.153 
755)
+++ automake.in Sat, 10 Mar 2001 18:58:10 +0100 akim (am/f/39_automake.i 1.153 
755)
@@ -6372,11 +6372,12 @@ sub read_am_file
        }
        elsif (/$IF_PATTERN/o)
        {
-           my $cond = $1;
-           &am_line_error ($., "$cond does not appear in AM_CONDITIONAL")
-               if ! $configure_cond{$cond} && $cond !~ /^TRUE|FALSE$/;
+           my $new_cond = $1;
+           &am_line_error ($., "$new_cond does not appear in AM_CONDITIONAL")
+               if ! $configure_cond{$new_cond} && $new_cond !~ /^TRUE|FALSE$/;
            push (@conditional_stack,
-                 ($cond =~ /^TRUE|FALSE$/) ? "$cond" : "${cond}_TRUE");
+                 (($new_cond =~ /^TRUE|FALSE$/)
+                  ? "$new_cond" : "${new_cond}_TRUE"));
            $cond = conditional_string (@conditional_stack);
        }
        elsif (/$ELSE_PATTERN/o)
@@ -6755,11 +6755,11 @@ sub file_contents ($%)
         # Handling the conditionals.
         elsif (/$IF_PATTERN/o)
        {
-           my $cond = $1;
-           &am_line_error ($., "$cond does not appear in AM_CONDITIONAL")
-               if ! $configure_cond{$cond} && $cond !~ /^TRUE|FALSE$/;
+           my $new_cond = $1;
+           &am_line_error ($., "$new_cond does not appear in AM_CONDITIONAL")
+               if ! $configure_cond{$new_cond} && $new_cond !~ /^TRUE|FALSE$/;
            push (@cond_stack,
-                 ($cond =~ /^TRUE|FALSE$/) ? "$cond" : "${cond}_TRUE");
+                 ($new_cond =~ /^TRUE|FALSE$/) ? "$new_cond" : 
"${new_cond}_TRUE");
            $cond = conditional_string (@cond_stack);
        }
        elsif (/$ELSE_PATTERN/o)