From: Karl Berry <karl@freefriends.org>
Date: Fri, 21 Feb 2025 17:58:12 +0000 (-0800)
Subject: m4: force newline after AM_SILENT_RULES, as before 1.17.
X-Git-Tag: v1.17.90~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29d21ffc8e12f32b2c6e8d700f1eee18778ed403;p=thirdparty%2Fautomake.git

m4: force newline after AM_SILENT_RULES, as before 1.17.

From https://bugs.gnu.org/72267.

* m4/silent.m4 (AM_SILENT_RULES): m4_newline() after the assignment.
Report from Francis Dupont, suggestions from Francis and Nick Bowler.
* NEWS: mention this.
* THANKS: add Francis.
---

diff --git a/NEWS b/NEWS
index 504901a88..34876f3db 100644
--- a/NEWS
+++ b/NEWS
@@ -4,17 +4,12 @@ please see NEWS-future and start following the advice there now.
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 New in 1.x:
 
-* New features added:
+* New features added
 
   - Support for Algol 68 added, based on the GNU Algol 68 compiler. (bug#75807)
 
   - New option dist-bzip3 for bzip3 compression of distributions. (bug#73795)
 
-* Miscellaneous changes
-
-  - Only require the presence of an ABOUT-NLS file at the 'gnits'
-    strictness level.
-
 * Bugs fixed
 
   - Do not make Perl warnings fatal, per Perl's recommendation.
@@ -32,9 +27,16 @@ New in 1.x:
   - The compile script is more robust to Windows configurations;
     specifically, avoiding double-path translation on MSYS. (bug#75939)
 
+  - AM_SILENT_RULES once again always ends with a newline. (bug#72267)
+
   - AM_SANITY_CHECK outputs a "no" for failure before fatal errors.
     (bug#76448)
 
+* Miscellaneous changes
+
+  - Only require the presence of an ABOUT-NLS file at the 'gnits'
+    strictness level.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New in 1.17 (2024-07-11):
diff --git a/THANKS b/THANKS
index 634c77c9b..0f44235aa 100644
--- a/THANKS
+++ b/THANKS
@@ -139,6 +139,7 @@ Felix Yan                       felixonmars@archlinux.org
 Flavien Astraud                 flav42@yahoo.fr
 Florian Briegel                 briegel@zone42.de
 Francesco Salvestrini           salvestrini@gmail.com
+Francis Dupont                  Francis.Dupont@fdupont.fr
 François Pinard                 pinard@iro.umontreal.ca
 Fred Fish                       fnf@ninemoons.com
 Frédéric Bérat                fberat@redhat.com
diff --git a/m4/silent.m4 b/m4/silent.m4
index 56334d3b9..a2865fded 100644
--- a/m4/silent.m4
+++ b/m4/silent.m4
@@ -68,4 +68,8 @@ fi
 # empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
 [AC_REQUIRE([_AM_SILENT_RULES])
-AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])m4_newline
+dnl We intentionally force a newline after the assignment, since a) nothing
+dnl good can come of more text following, and b) that was the behavior
+dnl before 1.17. See https://bugs.gnu.org/72267.
+])