* automake.in (&read_am_file, &file_contents): Avoid name clashes

on $cond.

diff --git a/ChangeLog b/ChangeLog
index cb7316acaf8fcf7e99ccf78ef16cd7d034656a1b..28a5ad493d13819aaa2281b2ee69ccb1ada3a633 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-23  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&read_am_file, &file_contents): Avoid name clashes
+       on $cond.
+
 2001-03-23  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&variable_conditionally_defined): Rename as...

diff --git a/automake.in b/automake.in
index cc4113fbc829c823b0a1bb02e2c10225686e4721..2d83531fe0d9a52d810a71cb1eec3bd882888205 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -6416,11 +6416,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)
@@ -6781,11 +6782,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)