From b57f526356647834464fc4d4f9ff5d7817b73a09 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 1 Jul 2025 14:27:37 +0200
Subject: [PATCH] Fix an autoreconf failure in packages that only need AM_NLS.

Rationale: https://lists.gnu.org/archive/html/bug-gettext/2025-06/msg00009.html

* gettext-tools/m4/Makefile.am (aclocaldir, aclocal_DATA): New variables.
* PACKAGING: Update.
---
 PACKAGING                    |  1 +
 gettext-tools/m4/Makefile.am | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/PACKAGING b/PACKAGING
index 905559329..3418c49ce 100644
--- a/PACKAGING
+++ b/PACKAGING
@@ -156,6 +156,7 @@ is according to the following file list.
       $prefix/share/gettext/archive.cvs.tar.*   (only installed if --with-cvs specified)
       $prefix/share/gettext/disclaim-translations.txt
       $prefix/share/gettext-$VERSION/its/*
+      $prefix/share/aclocal/nls.m4
       $prefix/share/emacs/site-lisp/po-compat.el
       $prefix/share/emacs/site-lisp/po-compat.elc
       $prefix/share/emacs/site-lisp/po-mode.el
diff --git a/gettext-tools/m4/Makefile.am b/gettext-tools/m4/Makefile.am
index ac3daf4ef..ed3c0386d 100644
--- a/gettext-tools/m4/Makefile.am
+++ b/gettext-tools/m4/Makefile.am
@@ -54,7 +54,17 @@ EXTRA_DIST = \
   locale-de.m4
 
 
-# List of all file names that we ever stored in $(aclocaldir).
+# Files installed for use by the old intltool.m4.
+# Listing nls.m4 is OK here, since it has essentially not changed over 20 years
+# and probably won't change in the future either.
+
+aclocaldir = @aclocaldir@
+aclocal_DATA = \
+  ../../gettext-runtime/m4/nls.m4
+
+
+# List of all file names that we ever stored in $(aclocaldir),
+# minus those that we still store in $(aclocaldir).
 OLD_M4_FILES = \
   build-to-host.m4 \
   codeset.m4 \
@@ -82,7 +92,6 @@ OLD_M4_FILES = \
   lock.m4 \
   longdouble.m4 \
   longlong.m4 \
-  nls.m4 \
   po.m4 \
   printf-posix.m4 \
   progtest.m4 \
-- 
2.47.3