From 3922628f1445ed93e6a4c9a851b549faebf09b27 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Mon, 9 Apr 2001 10:07:17 +0000 Subject: [PATCH] * automake.in (&transform): Fix an incredible bug which was breaking the if/endif system. ($ELSE_PATTERN): Admit an optional argument. --- ChangeLog | 6 ++++++ automake.in | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b17dfc5e8..3b588677b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-04-09 Akim Demaille + + * 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 * comp-vars.am: Remove, merged into... diff --git a/automake.in b/automake.in index 89a3fcb98..12b502bc4 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;"; } } -- 2.47.2