From: Colomban Wendling <lists.ban@herbesfolles.org>
Date: Mon, 6 Apr 2020 00:35:51 +0000 (-0700)
Subject: vala: more precise argument matching.
X-Git-Tag: v1.16.3~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a523b69a39d5d74f42c9ea0d142cbfec08a6fe00;p=thirdparty%2Fautomake.git

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).
---

diff --git a/NEWS b/NEWS
index b7fe2b5b0..1bf5a0cd3 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 212cb3813..566c08a66 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"