From: Gavin Smith <gavinsmith0123@gmail.com>
Date: Sun, 20 Oct 2024 21:34:39 +0000 (-0700)
Subject: automake: require ABOUT-NLS only at gnits strictness.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=thirdparty%2Fautomake.git

automake: require ABOUT-NLS only at gnits strictness.

From https://lists.gnu.org/archive/html/automake/2024-10/msg00006.html.

* bin/automake.in (handle_gettext): In require_file for ABOUT-NLS,
change strictness level from GNU to GNITS.
* NEWS: Add notice.
---

diff --git a/NEWS b/NEWS
index d33323ccc..0ad52c475 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,14 @@
 For planned incompatibilities in a possible future Automake 2.0 release,
 please see NEWS-2.0 and start following the advice there now.
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+New in 1.x:
+
+* Miscellaneous changes
+
+   - Only require the presence of an ABOUT-NLS file at the 'gnits'
+     strictness level.
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 New in 1.17:
diff --git a/bin/automake.in b/bin/automake.in
index a17f45236..479125505 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -4549,8 +4549,7 @@ sub handle_gettext ()
 	if ($seen_gettext_external && ! $seen_gettext_intl
 	    && grep ($_ eq 'intl', @subdirs));
     }
-
-  require_file ($ac_gettext_location, GNU, 'ABOUT-NLS');
+  require_file ($ac_gettext_location, GNITS, 'ABOUT-NLS');
 }
 
 # Emit makefile footer.