From: Akim Demaille <akim@epita.fr>
Date: Fri, 23 Mar 2001 17:58:33 +0000 (+0000)
Subject: * automake.in (&read_am_file, &file_contents): Avoid name clashes
X-Git-Tag: handle-languages~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bdde35f55e050c760446e13b35a5e78fa9b566d;p=thirdparty%2Fautomake.git

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

diff --git a/ChangeLog b/ChangeLog
index cb7316aca..28a5ad493 100644
--- 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 cc4113fbc..2d83531fe 100755
--- 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)