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 90adaefe81299ee1c26dd6a14077a1ba3aaf0ff9..b0758ac62aed1d2c645f748ee2850d6e6f439e5a 100644 (file)
--- 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 214a0022d870febc998c28913bdb221e839f3e22..fd6c62b7eb7f5fe70fd4fde9ab84c099e681f7c0 100644 (file)
--- 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 05e39ed709ce1687f4f7c74d443428d166aef26a..18201374223f9e7723b5e380fac03e62b87fd26c 100644 (file)
--- 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