From: Akim Demaille <akim@epita.fr>
Date: Mon, 9 Apr 2001 10:07:16 +0000 (+0000)
Subject: * automake.in (&transform): Fix an incredible bug which was
X-Git-Tag: handle-languages~97
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=76d2247c0a82de94552859a3fc1dd5a6e0f3977f;p=automake.git

* automake.in (&transform): Fix an incredible bug which was
breaking the if/endif system.
($ELSE_PATTERN): Admit an optional argument.
---

diff --git a/ChangeLog b/ChangeLog
index b17dfc5e..3b588677 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-09  Akim Demaille  <akim@epita.fr>
+
+	* automake.in (&transform): Fix an incredible bug which was
+	breaking the if/endif system.
+	($ELSE_PATTERN): Admit an optional argument.
+
 2001-04-09  Akim Demaille  <akim@epita.fr>
 
 	* comp-vars.am: Remove, merged into...
diff --git a/automake.in b/automake.in
index 89a3fcb9..12b502bc 100755
--- a/automake.in
+++ b/automake.in
@@ -60,7 +60,7 @@ my $MACRO_PATTERN = "^ *([A-Za-z0-9_\@]+)[ \t]*([:+]?)=[ \t]*(.*)\$";
 my $BOGUS_MACRO_PATTERN = "^ *([^ \t]*)[ \t]*([:+]?)=[ \t]*(.*)\$";
 my $GNITS_VERSION_PATTERN = "[0-9]+\\.[0-9]+([a-z]|\\.[0-9]+)?";
 my $IF_PATTERN = "^if[ \t]+([A-Za-z][A-Za-z0-9_]*)[ \t]*(#.*)?\$";
-my $ELSE_PATTERN = "^else[ \t]*(#.*)?\$";
+my $ELSE_PATTERN =   "^else(?:[ \t]+([A-Za-z][A-Za-z0-9_]*))?[ \t]*(#.*)?\$";
 my $ENDIF_PATTERN = "^endif(?:[ \t]+([A-Za-z][A-Za-z0-9_]*))?[ \t]*(#.*)?\$";
 my $PATH_PATTERN='(\\w|[/.-])+';
 # This will pass through anything not of the prescribed form.
@@ -6949,12 +6949,12 @@ sub transform (%)
 	if ($val)
 	{
 	    $result .= "s/\Q?$token?\E//gm;s/^.*\Q?!$token?\E.*\\n//gm;";
-	    $result .= "s/\Q%?$token%\E/TRUE/gm;s/^.*\Q%!$token%\E.*\\n/FALSE/gm;";
+	    $result .= "s/\Q%?$token%\E/TRUE/gm;s/\Q%!$token%\E/FALSE/gm;";
 	}
 	else
 	{
 	    $result .= "s/\Q?!$token?\E//gm;s/^.*\Q?$token?\E.*\\n//gm;";
-	    $result .= "s/\Q%?$token%\E/FALSE/gm;s/^.*\Q%!$token%\E.*\\n/TRUE/gm;";
+	    $result .= "s/\Q%?$token%\E/FALSE/gm;s/\Q%!$token%\E/TRUE/gm;";
 	}
     }