[automake-commit] branch master updated: vala: more precise argument matching.

[Karl Berry]

This is an automated email from the git hooks/post-receive script.

karl pushed a commit to branch master
in repository automake.

View the commit online:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=a523b69a39d5d74f42c9ea0d142cbfec08a6fe00

The following commit(s) were added to refs/heads/master by this push:
     new a523b69  vala: more precise argument matching.
a523b69 is described below

commit a523b69a39d5d74f42c9ea0d142cbfec08a6fe00
Author: Colomban Wendling <address@hidden>
AuthorDate: Sun Apr 5 17:35:51 2020 -0700

    vala: more precise argument matching.
    
    This change fixes https://bugs.gnu.org/18734.
    
    * bin/automake.in (lang_vala_finish_target): anchor option regexp
    so that, e.g., an argument "vapi" does not match the option --vapi.
    * NEWS: mention this (and preceding checklinkx change, sorry).
---
 NEWS            | 8 ++++++++
 bin/automake.in | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index b7fe2b5..1bf5a0c 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,14 @@
 
 New in ?.?.?:
 
+* Bugs fixed
+
+  - Broken links in manual fixed or removed, and new script
+    contrib/checklinkx (a small modification of W3C checklink) added,
+    with accompany target checklinkx to recheck urls.
+
+  - valac argument matching more precise, to avoid garbage in DIST_COMMON.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New in 1.16.2:
diff --git a/bin/automake.in b/bin/automake.in
index 212cb38..566c08a 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -5736,8 +5736,8 @@ sub lang_vala_finish_target
       my $lastflag = '';
       foreach my $flag ($flags->value_as_list_recursive)
        {
-         if (grep (/$lastflag/, ('-H', '-h', '--header', '--internal-header',
-                                 '--vapi', '--internal-vapi', '--gir')))
+         if (grep (/^$lastflag$/, ('-H', '-h', '--header', '--internal-header',
+                                   '--vapi', '--internal-vapi', '--gir')))
            {
              my $headerfile = "\$(srcdir)/$flag";
              $output_rules .= "$headerfile: \$(srcdir)/${derived}_vala.stamp\n"