From: Bruno Haible <bruno@clisp.org>
Date: Sat, 13 Sep 2025 15:34:13 +0000 (+0200)
Subject: gettext-h: Move fallback definition of GNULIB_TEXT_DOMAIN.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cea7fc1b0d06ea980530bdcefc2b3d19356755e5;p=thirdparty%2Fgnulib.git

gettext-h: Move fallback definition of GNULIB_TEXT_DOMAIN.

* lib/gettext.h (GNULIB_TEXT_DOMAIN): Remove macro.
* modules/gettext-h (configure.ac): Define it here instead.
---

diff --git a/ChangeLog b/ChangeLog
index 90adaefe81..b0758ac62a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-09-13  Bruno Haible  <bruno@clisp.org>
+
+	gettext-h: Move fallback definition of GNULIB_TEXT_DOMAIN.
+	* lib/gettext.h (GNULIB_TEXT_DOMAIN): Remove macro.
+	* modules/gettext-h (configure.ac): Define it here instead.
+
 2025-09-12  Bruno Haible  <bruno@clisp.org>
 
 	pagealign_alloc: Improve documentation.
diff --git a/lib/gettext.h b/lib/gettext.h
index 214a0022d8..fd6c62b7eb 100644
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -347,11 +347,5 @@ dcnpgettext_expr (const char *domain,
   return (n == 1 ? msgid : msgid_plural);
 }
 
-/* The text domainname for Gnulib messages.  Ordinarily this is "gnulib",
-   but packages that do their own translations of Gnulib can use
-   something different by defining GNULIB_TEXT_DOMAIN early.  */
-#ifndef GNULIB_TEXT_DOMAIN
-# define GNULIB_TEXT_DOMAIN "gnulib"
-#endif
 
 #endif /* _LIBGETTEXT_H */
diff --git a/modules/gettext-h b/modules/gettext-h
index 05e39ed709..1820137422 100644
--- a/modules/gettext-h
+++ b/modules/gettext-h
@@ -11,6 +11,14 @@ vararrays
 configure.ac:
 AC_SUBST([LIBINTL])
 AC_SUBST([LTLIBINTL])
+AH_BOTTOM([
+/* The text domainname for Gnulib messages.  Ordinarily this is "gnulib",
+   but packages that do their own translations of Gnulib can use something
+   different by defining GNULIB_TEXT_DOMAIN in their config.h file.  */
+#ifndef GNULIB_TEXT_DOMAIN
+# define GNULIB_TEXT_DOMAIN/**/"gnulib"
+#endif
+])
 
 Makefile.am:
 lib_SOURCES += gettext.h