gettext-h: support overriding "gnulib"

This is for GNU Diffutils, which is still using the old way
of also translating Gnulib’s msgids.
* lib/gettext.h (GNULIB_TEXT_DOMAIN): New macro.
* lib/argmatch.c, lib/bitset/stats.c, lib/c-stack.c:
* lib/clean-temp-simple.c, lib/clean-temp-simple.c, lib/clean-temp.c:
* lib/closein.c, lib/closeout.c, lib/copy-acl.c, lib/copy-file.c:
* lib/csharpcomp.c, lib/csharpexec.c, lib/cygpath.c, lib/dfa.c:
* lib/error.c, lib/execute.c, lib/gai_strerror.c, lib/getaddrinfo.c:
* lib/getopt.c, lib/javacomp.c, lib/javaexec.c, lib/javaversion.c:
* lib/mkdir-p.c, lib/obstack.c, lib/openat-die.c, lib/os2-spawn.c:
* lib/pagealign_alloc.c, lib/parse-datetime.y, lib/pipe-filter-gi.c:
* lib/pipe-filter-ii.c, lib/quotearg.c, lib/rpmatch.c, lib/set-acl.c:
* lib/sigpipe-die.c, lib/spawn-pipe.c, lib/strsignal.c, lib/timevar.c:
* lib/unicodeio.c, lib/userspec.c, lib/vc-mtime.c, lib/version-etc.c:
* lib/wait-process.c, lib/windows-cygpath.c, lib/xalloc-die.c:
* lib/xbinary-io.c, lib/xfreopen.c, lib/xmemcoll.c, lib/xprintf.c:
* lib/xsetenv.c, lib/xstdopen.c, lib/xstrerror.c, lib/xstrtol-error.c:
(_): Use GNULIB_TEXT_DOMAIN instead of "gnulib" when calling dgettext.
* lib/argmatch.h (ARGMATCH_DEFINE_GROUP):
* lib/file-type.c (file_type):
* lib/regex_internal.h (gettext) [HAVE_LIBINTL_H & ENABLE_NLS & !_LIBC]:
* lib/xstrtol-error.c (xstrtol_error):
Likewise.

diff --git a/ChangeLog b/ChangeLog
index 0e0ff49b4a920cc6d5e8ed889e05462f31a079c1..013d9833c6dc96f2033e740d87aff15338a74314 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+2025-09-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       gettext-h: support overriding "gnulib"
+       This is for GNU Diffutils, which is still using the old way
+       of also translating Gnulib’s msgids.
+       * lib/gettext.h (GNULIB_TEXT_DOMAIN): New macro.
+       * lib/argmatch.c, lib/bitset/stats.c, lib/c-stack.c:
+       * lib/clean-temp-simple.c, lib/clean-temp-simple.c, lib/clean-temp.c:
+       * lib/closein.c, lib/closeout.c, lib/copy-acl.c, lib/copy-file.c:
+       * lib/csharpcomp.c, lib/csharpexec.c, lib/cygpath.c, lib/dfa.c:
+       * lib/error.c, lib/execute.c, lib/gai_strerror.c, lib/getaddrinfo.c:
+       * lib/getopt.c, lib/javacomp.c, lib/javaexec.c, lib/javaversion.c:
+       * lib/mkdir-p.c, lib/obstack.c, lib/openat-die.c, lib/os2-spawn.c:
+       * lib/pagealign_alloc.c, lib/parse-datetime.y, lib/pipe-filter-gi.c:
+       * lib/pipe-filter-ii.c, lib/quotearg.c, lib/rpmatch.c, lib/set-acl.c:
+       * lib/sigpipe-die.c, lib/spawn-pipe.c, lib/strsignal.c, lib/timevar.c:
+       * lib/unicodeio.c, lib/userspec.c, lib/vc-mtime.c, lib/version-etc.c:
+       * lib/wait-process.c, lib/windows-cygpath.c, lib/xalloc-die.c:
+       * lib/xbinary-io.c, lib/xfreopen.c, lib/xmemcoll.c, lib/xprintf.c:
+       * lib/xsetenv.c, lib/xstdopen.c, lib/xstrerror.c, lib/xstrtol-error.c:
+       (_): Use GNULIB_TEXT_DOMAIN instead of "gnulib" when calling dgettext.
+       * lib/argmatch.h (ARGMATCH_DEFINE_GROUP):
+       * lib/file-type.c (file_type):
+       * lib/regex_internal.h (gettext) [HAVE_LIBINTL_H & ENABLE_NLS & !_LIBC]:
+       * lib/xstrtol-error.c (xstrtol_error):
+       Likewise.
+
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
        Remove support for OSF/1.

diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index e9ee83703c0b57a6d47d028728a34d2293ee9bf7..009a25ce61c71219ff125f5bc2ab2d7689eea473 100644 (file)
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -1114,6 +1114,11 @@ translatable strings to be included in your POT file.  When you send
 this POT file to the Translation Project, translators will normally fill
 in the translations of the Gnulib strings from their ``translation
 memory'', and send you back updated PO files.
+For this to work, your program should define the macro
+@code{GNULIB_TEXT_DOMAIN} to its own textdomain name early,
+before including @file{gettext.h};
+you can do this by putting @code{AC_DEFINE([GNULIB_TEXT_DOMAIN], [PACKAGE])}
+in your @file{configure.ac}.
 
 However, this process is error-prone: you might forget to list some
 source files, or the translator might not be using a translation memory

diff --git a/lib/argmatch.c b/lib/argmatch.c
index 0aee39c1ee7a69127c03b2ab078c2e8bd5da8de0..e9b7c66a723d6538fd3a83cb2bf2f86a408f4a33 100644 (file)
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #include <error.h>
 #include "quotearg.h"

diff --git a/lib/argmatch.h b/lib/argmatch.h
index 54bd1fcf64ab8326ad7e698ef2c2d5aa3d55c435..4eac4ac93876071fa86a5aaefcf974c271a3cf56 100644 (file)
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -239,7 +239,7 @@ char const *argmatch_to_argument (void const *value,
                                                                         \
     /* Try to put synonyms on the same line.  Synonyms are expected     \
        to follow each other. */                                         \
-    fputs (dgettext ("gnulib", "Valid arguments are:"), out);           \
+    fputs (dgettext (GNULIB_TEXT_DOMAIN, "Valid arguments are:"), out); \
     for (int i = 0; g->args[i].arg; i++)                                \
       if (i == 0                                                        \
           || memcmp (&g->args[i-1].val, &g->args[i].val, size))         \

diff --git a/lib/bitset/stats.c b/lib/bitset/stats.c
index ec1bf758bd78e867899a7069e96efca94a923c55..738c76a7902399ddaa7112df925ff593831bc188 100644 (file)
--- a/lib/bitset/stats.c
+++ b/lib/bitset/stats.c
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #include "bitset/array.h"
 #include "bitset/base.h"

diff --git a/lib/c-stack.c b/lib/c-stack.c
index 794ef9591360b5be87227c3d049f2e65a289439c..f8321f871c90aedcc7182800e9c4d380bc749ecb 100644 (file)
--- a/lib/c-stack.c
+++ b/lib/c-stack.c
@@ -56,7 +56,7 @@
 #include "ignore-value.h"
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 /* Here we need the original abort() function.  (Printing a stack trace
    from within a signal handler is not going to work in most cases anyway.)  */

diff --git a/lib/clean-temp-simple.c b/lib/clean-temp-simple.c
index 95103b8ac0f33e264f4641ff68f2961ce03a9ba6..aae2290daaa395600e4ccc8609990977fcbb25a5 100644 (file)
--- a/lib/clean-temp-simple.c
+++ b/lib/clean-temp-simple.c
@@ -38,7 +38,7 @@
 #include "hashkey-string.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Lock that protects the file_cleanup_list from concurrent modification in

diff --git a/lib/clean-temp.c b/lib/clean-temp.c
index e8d0cf31138a2072a1e8552085adea539dcef35b..a0b7ed99f6097d4ea5bb1c12805cfb58c4dc381e 100644 (file)
--- a/lib/clean-temp.c
+++ b/lib/clean-temp.c
@@ -66,7 +66,7 @@
 # include "stdio--.h"
 #endif
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 /* GNU Hurd doesn't have PATH_MAX.  Use a fallback.
    Temporary directory names are usually not that long.  */

diff --git a/lib/closein.c b/lib/closein.c
index aec0f132827a11fad32c0d656fd5e7c28c93eea4..5db106fb522f8358c3c0613a98df063d5ed08894 100644 (file)
--- a/lib/closein.c
+++ b/lib/closein.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #include "close-stream.h"
 #include "closeout.h"

diff --git a/lib/closeout.c b/lib/closeout.c
index 5cae504e1173298dcd34a05f5efd1f7d428c0cd2..d3a09c877674c3e84623aa67e3656478c2959aaf 100644 (file)
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -25,7 +25,7 @@
 #include <unistd.h>
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #include "close-stream.h"
 #include <error.h>

diff --git a/lib/copy-acl.c b/lib/copy-acl.c
index 2fce6c7d46724d8ef19bad9bf015aa405bd208c6..a92740899cedaaf30067e86abd5178033263383d 100644 (file)
--- a/lib/copy-acl.c
+++ b/lib/copy-acl.c
@@ -26,7 +26,7 @@
 #include "quote.h"
 #include <error.h>
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Copy access control lists from one file to another. If SOURCE_DESC is

diff --git a/lib/copy-file.c b/lib/copy-file.c
index ddcee13f34de52986de544bbcdcded35ed8beb51..56af147b528c70d3e491e536caac7bf214b34c69 100644 (file)
--- a/lib/copy-file.c
+++ b/lib/copy-file.c
@@ -39,7 +39,7 @@
 #include "quote.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 enum { IO_SIZE = 32 * 1024 };
 

diff --git a/lib/csharpcomp.c b/lib/csharpcomp.c
index 5b6c9684d97e57692440dca278f3d69c6839973c..bda064b686bb1e9d60aab0c2b4fba8e1c10a2482 100644 (file)
--- a/lib/csharpcomp.c
+++ b/lib/csharpcomp.c
@@ -40,7 +40,7 @@
 #include "xvasprintf.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Survey of C# compilers.

diff --git a/lib/csharpexec.c b/lib/csharpexec.c
index 13a05a7e73f69e9d6f87fd4631da59e06a91578c..385242422933d31f8e11f6424f486f86e611f615 100644 (file)
--- a/lib/csharpexec.c
+++ b/lib/csharpexec.c
@@ -76,7 +76,7 @@
 #undef new_classpath
 #undef CLASSPATHVAR
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Survey of CIL interpreters.

diff --git a/lib/cygpath.c b/lib/cygpath.c
index 97212b6d446bc3185ff47ec75e554d447fc5bc14..d8c984c330daf3a03ad235ae97cb8f2146689634 100644 (file)
--- a/lib/cygpath.c
+++ b/lib/cygpath.c
@@ -26,7 +26,7 @@
 #include "xalloc.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #ifdef __CYGWIN__
 

diff --git a/lib/dfa.c b/lib/dfa.c
index 284f10da3fbf112b7a1adf3a7c00dc08a43bc3f5..d0011afc489727963f8e77cce038075cc893c4e5 100644 (file)
--- a/lib/dfa.c
+++ b/lib/dfa.c
@@ -39,7 +39,7 @@
 #include "localeinfo.h"
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #if GAWK
 /* Use ISO C 99 API.  */

diff --git a/lib/error.c b/lib/error.c
index 9231c79c8359983e56acb1f78e9193ac2d57b857..ab4c38f339a7852cedd77697c2c1b925bd082c8a 100644 (file)
--- a/lib/error.c
+++ b/lib/error.c
@@ -38,7 +38,7 @@
 
 #if !_LIBC && ENABLE_NLS
 # include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 #endif
 
 #ifdef _LIBC

diff --git a/lib/execute.c b/lib/execute.c
index 3d51e2eb5d32c24569829fd5fb58ecaf24d972a9..2d09750c7a86811e453805af9aa0cef4c522fee3 100644 (file)
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -40,7 +40,7 @@
 #include "xalloc.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Choice of implementation for native Windows.

diff --git a/lib/file-type.c b/lib/file-type.c
index c1ccf1f546c74e4cdea1a9fd51b93dcb6400eb59..1639ae67566a1d5960f7a3e6bda5acc9d370efb1 100644 (file)
--- a/lib/file-type.c
+++ b/lib/file-type.c
@@ -27,5 +27,5 @@
 char const *
 file_type (struct stat const *st)
 {
-  return dgettext ("gnulib", c_file_type (st));
+  return dgettext (GNULIB_TEXT_DOMAIN, c_file_type (st));
 }

diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c
index 9c5f141948f89692926fe829bf081ed6f947451d..df9d7e6be86c3ed91baea75c5f4a426d0f7c82bb 100644 (file)
--- a/lib/gai_strerror.c
+++ b/lib/gai_strerror.c
@@ -27,7 +27,7 @@
 # include <libintl.h>
 #else
 # include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 # define N_(msgid) msgid
 #endif
 

diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index a8c45c21c234d3ea47cc1553328c7564831eebee..c022c92f2d7b430eb5fad0165912d89556d313cc 100644 (file)
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -40,7 +40,7 @@
 #include <stdio.h>
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 #define N_(msgid) msgid
 
 /* BeOS has AF_INET, but not PF_INET.  */

diff --git a/lib/getopt.c b/lib/getopt.c
index 6b155e6c63570364616a92855245d9dedb0b82b6..d61bf8619c0df946eea37cdb6d1e23ae12580aeb 100644 (file)
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -42,7 +42,7 @@
 # define funlockfile(fp) _IO_funlockfile (fp)
 #else
 # include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 /* When used standalone, flockfile and funlockfile might not be
    available.  */
 # if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \

diff --git a/lib/gettext.h b/lib/gettext.h
index fd6c62b7eb7f5fe70fd4fde9ab84c099e681f7c0..214a0022d870febc998c28913bdb221e839f3e22 100644 (file)
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -347,5 +347,11 @@ 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/lib/javacomp.c b/lib/javacomp.c
index ff18f79e3528e1e0a293ffa0985f7cb44c071f0f..1c01a8d077cec211e8fb53ed60da96a9d1dac2ce 100644 (file)
--- a/lib/javacomp.c
+++ b/lib/javacomp.c
@@ -50,7 +50,7 @@
 #include "c-strstr.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Survey of Java compilers.

diff --git a/lib/javaexec.c b/lib/javaexec.c
index 1158971ff9a997d4515cf5f6fb4aff8dcdeabe69..7e637f3533abbe5025b4ba5ef081b336ecf1d08f 100644 (file)
--- a/lib/javaexec.c
+++ b/lib/javaexec.c
@@ -35,7 +35,7 @@
 #include <error.h>
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Survey of Java virtual machines.

diff --git a/lib/javaversion.c b/lib/javaversion.c
index bd680354a46b76a9ef0e9c2dee23292fb70f4f7d..ea107f48d54218f24e82ef909edca5b81704fec4 100644 (file)
--- a/lib/javaversion.c
+++ b/lib/javaversion.c
@@ -37,7 +37,7 @@
 #include <error.h>
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 /* Get PKGDATADIR.  */
 #include "configmake.h"

diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c
index 7b764f122dbd15362dd01dfcfbdf9aedf1f15371..6c10819401229a0f6ff404a428853b5c960632a8 100644 (file)
--- a/lib/mkdir-p.c
+++ b/lib/mkdir-p.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #include "dirchownmod.h"
 #include "dirname.h"

diff --git a/lib/obstack.c b/lib/obstack.c
index d6d1510b092285195306d5aafd9db97aadd66be9..8c4a5d55ab1cfe5a1de0f8e4950ddfe9517219b0 100644 (file)
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -337,7 +337,7 @@ _obstack_memory_used (struct obstack *h)
 # else
 #  include "gettext.h"
 #  ifndef _
-#   define _(msgid) dgettext ("gnulib", msgid)
+#   define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 #  endif
 # endif
 

diff --git a/lib/openat-die.c b/lib/openat-die.c
index 79a5b23bc8397ef56876959aa5a7be6396198133..589dbd15048859576a65c9fb111e9923651e7482 100644 (file)
--- a/lib/openat-die.c
+++ b/lib/openat-die.c
@@ -28,7 +28,7 @@
 #include "exitfail.h"
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 _Noreturn void
 openat_save_fail (int errnum)

diff --git a/lib/os2-spawn.c b/lib/os2-spawn.c
index 7decf1b580cee39d5898d0f7ab59ab933b10e838..0bdf27162b27b55fb01dfe46440dcf215ad65a03 100644 (file)
--- a/lib/os2-spawn.c
+++ b/lib/os2-spawn.c
@@ -38,7 +38,7 @@
 #include <error.h>
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Duplicates a file handle, making the copy uninheritable.

diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index e460356c3f78c2d4dabce8852e1ada11a00cdb6a..b027e78fc68e67af1390f9233bf2008fd22aac82 100644 (file)
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -36,7 +36,7 @@
 #include "xalloc.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #if HAVE_MMAP
 /* Define MAP_FILE when it isn't otherwise.  */

diff --git a/lib/parse-datetime.y b/lib/parse-datetime.y
index c120eae04a9d9f0534b4501452dc8c2aa68f632d..a17b631d029968f21a2d526bc4b2c6477901c84a 100644 (file)
--- a/lib/parse-datetime.y
+++ b/lib/parse-datetime.y
@@ -60,7 +60,7 @@
 
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 /* Bison's skeleton tests _STDLIB_H, while some stdlib.h headers
    use _STDLIB_H_ as witness.  Map the latter to the one bison uses.  */

diff --git a/lib/pipe-filter-gi.c b/lib/pipe-filter-gi.c
index c8b29c5852976ecd8fb86b77a70b3dcd64db678d..a04da1c461d4adf81bdc3196b588e7b5b84019fd 100644 (file)
--- a/lib/pipe-filter-gi.c
+++ b/lib/pipe-filter-gi.c
@@ -39,7 +39,7 @@
 #include "xalloc.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #include "pipe-filter-aux.h"
 

diff --git a/lib/pipe-filter-ii.c b/lib/pipe-filter-ii.c
index f63343ed1f86a7b5f870a80012d6347e1e45ef25..ff7a2dfff6793995ddfc74a3073b2d77db5fe1ff 100644 (file)
--- a/lib/pipe-filter-ii.c
+++ b/lib/pipe-filter-ii.c
@@ -158,7 +158,7 @@ WaitForMultipleObjects (DWORD nCount, const HANDLE *pHandles, BOOL bWaitAll,
 #include "wait-process.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #include "pipe-filter-aux.h"
 

diff --git a/lib/quotearg.c b/lib/quotearg.c
index 7de75552384f22238f6108e536b4623bd810918f..325f3d9172b504a54ad468973cdbd13c065c3ea3 100644 (file)
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -44,7 +44,7 @@
 #include <wchar.h>
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 #define N_(msgid) msgid
 
 #ifndef SIZE_MAX

diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 1f2972999adc77dc7a49462a5607e0b50fa9465c..855025e13b83e80beec8de63dbe5eb81f7f36848 100644 (file)
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -105,7 +105,7 @@
 #  define gettext(msgid) \
   __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
 # else
-#  define gettext(msgid) dgettext ("gnulib", msgid)
+#  define gettext(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 # endif
 #else
 # undef gettext

diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index 0e7e6c3c36055f59af0b8aa11da6e11ce682432e..b1f06e3a54b7f1891988d45dd7fab460ad694ecb 100644 (file)
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -33,7 +33,7 @@
 # endif
 # include <regex.h>
 # include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 # define N_(msgid) gettext_noop (msgid)
 
 # if HAVE_LANGINFO_YESEXPR

diff --git a/lib/set-acl.c b/lib/set-acl.c
index 8f54029873b5e6cfa038802ce00a05a0735943fa..36d80c65aae40e828924b6e06fec1f604ed91651 100644 (file)
--- a/lib/set-acl.c
+++ b/lib/set-acl.c
@@ -26,7 +26,7 @@
 #include "quote.h"
 #include <error.h>
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 /* Set the access control lists of a file to match *exactly* MODE (this might
    remove inherited ACLs). Note chmod() tends to honor inherited/default

diff --git a/lib/sigpipe-die.c b/lib/sigpipe-die.c
index ddd05cd49c5f4b771cf6ac47cd9a5fd633dcbb7f..bc0ce327cb9b714721716e5143e08561633ca304 100644 (file)
--- a/lib/sigpipe-die.c
+++ b/lib/sigpipe-die.c
@@ -28,7 +28,7 @@
 #include "exitfail.h"
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 void
 sigpipe_die (void)

diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c
index 098352e2d506809eef29b5b31aa7ec339b770e5d..cd27addd4bb480dd4ef3bfd8bd013695bfd9033e 100644 (file)
--- a/lib/spawn-pipe.c
+++ b/lib/spawn-pipe.c
@@ -43,7 +43,7 @@
 #include "xalloc.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Choice of implementation for native Windows.

diff --git a/lib/strsignal.c b/lib/strsignal.c
index 738468afaa22ccb9a1aeae11c4cf5a7abeae5848..86653b3ac04294bfe178f632c728129ce1346349 100644 (file)
--- a/lib/strsignal.c
+++ b/lib/strsignal.c
@@ -30,7 +30,7 @@
 # include <libintl.h>
 #else /* !_LIBC */
 # include "gettext.h"
-# define _(msgid) dgettext ("gnulib", msgid)
+# define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 # define N_(msgid) gettext_noop (msgid)
 #endif /* _LIBC */
 

diff --git a/lib/timevar.c b/lib/timevar.c
index 8b2ea104be4df6c0521b5219e51d69941b9806e2..7e9f08728faa278b5016819a16cba5edf42ab9b1 100644 (file)
--- a/lib/timevar.c
+++ b/lib/timevar.c
@@ -32,7 +32,7 @@
 
 #include "gethrxtime.h"
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 #include "xalloc.h"
 
 /* See timevar.h for an explanation of timing variables.  */

diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index addaf7d8392ea8182476e8273d39042f77ad9f6b..5d3d27f48de3edcce6eea18f93d0a9485df1fb44 100644 (file)
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -33,7 +33,7 @@
 #include <error.h>
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 #define N_(msgid) msgid
 
 #include "localcharset.h"

diff --git a/lib/userspec.c b/lib/userspec.c
index bae72c97c011a86c3a118adbf77bee9d83ed3605..7c5088eb06db2d5b3f9bf398f259473984bd7848 100644 (file)
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -43,7 +43,7 @@
 #include "xstrtol.h"
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 #define N_(msgid) msgid
 
 #ifndef HAVE_ENDGRENT

diff --git a/lib/vc-mtime.c b/lib/vc-mtime.c
index 77acbabba4e5dc621424f906d79577650a36fdb7..4f867d694af54ce418bb2ad6cb6cc8638e2eaa6b 100644 (file)
--- a/lib/vc-mtime.c
+++ b/lib/vc-mtime.c
@@ -49,7 +49,7 @@
 #endif
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* ========================================================================== */

diff --git a/lib/version-etc.c b/lib/version-etc.c
index 703d7fcf4e9184f6ec929c0632c3ad5b821c9d21..bb108ffd2f2112c553002709f33e616e5d5430a4 100644 (file)
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -29,7 +29,7 @@
 #endif
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 /* If you use AM_INIT_AUTOMAKE's no-define option,
    PACKAGE is not defined.  Use PACKAGE_TARNAME instead.  */

diff --git a/lib/wait-process.c b/lib/wait-process.c
index e95f98c7a78440ba7277971e355c50937793196a..c2331bb522baa64f040f193556d0bf4933bc1762 100644 (file)
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -34,7 +34,7 @@
 #include "xalloc.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
 

diff --git a/lib/windows-cygpath.c b/lib/windows-cygpath.c
index 8b11898e3d228f921a951445d190333dcaf81550..6ac145819642d47211e3b7c28830adc00c96a03d 100644 (file)
--- a/lib/windows-cygpath.c
+++ b/lib/windows-cygpath.c
@@ -24,7 +24,7 @@
 #include "xalloc.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #if defined _WIN32 && !defined __CYGWIN__
 

diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c
index db1ee8ffe2fc8756ab83132160e9795f933b699b..c3f3961addd34eae828d24fbe1ceca26849dc9d2 100644 (file)
--- a/lib/xalloc-die.c
+++ b/lib/xalloc-die.c
@@ -26,7 +26,7 @@
 #include "exitfail.h"
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 void
 xalloc_die (void)

diff --git a/lib/xbinary-io.c b/lib/xbinary-io.c
index 67f209ee9dab362ec80605135f8e8c88706bf833..90e49d99ed7c5fb60dbaf8bae639655f446d847d 100644 (file)
--- a/lib/xbinary-io.c
+++ b/lib/xbinary-io.c
@@ -25,7 +25,7 @@
 #include "verify.h"
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #if O_BINARY
 

diff --git a/lib/xfreopen.c b/lib/xfreopen.c
index 6f775bbee45fb4de6fea1b70ca66e925df5a2f15..9f82eda9582514babb164dd4a6ae0db3bbb973c2 100644 (file)
--- a/lib/xfreopen.c
+++ b/lib/xfreopen.c
@@ -23,7 +23,7 @@
 #include "quote.h"
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 void
 xfreopen (char const *filename, char const *mode, FILE *fp)

diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index d1b141c9e057d5b2371d05804ebe2f61465d1a41..53eefe4d1913b3dc5909a8f2737bc2d7aa62cf6a 100644 (file)
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 #include <error.h>
 #include "exitfail.h"

diff --git a/lib/xprintf.c b/lib/xprintf.c
index 790af5320b9b856ffa31b0e58c7af0e2eae7b26d..1863876eb07785abedfc83634c2a9e28439a4425 100644 (file)
--- a/lib/xprintf.c
+++ b/lib/xprintf.c
@@ -26,7 +26,7 @@
 #include "exitfail.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 off64_t
 xprintf (char const *restrict format, ...)

diff --git a/lib/xsetenv.c b/lib/xsetenv.c
index 7dfa3fcd87f734f79dc801b1fb12b50d74e8398c..79f03d3892596abab44dd72bf33f9f3ec13128c2 100644 (file)
--- a/lib/xsetenv.c
+++ b/lib/xsetenv.c
@@ -24,7 +24,7 @@
 #include <error.h>
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 
 /* Set NAME to VALUE in the environment.

diff --git a/lib/xstdopen.c b/lib/xstdopen.c
index b6dca48252a716f5ae65f8ecb222a93ffe56c9b2..834ef757d3b515cc72f08b2a225fb76e207ac23c 100644 (file)
--- a/lib/xstdopen.c
+++ b/lib/xstdopen.c
@@ -24,7 +24,7 @@
 #include "exitfail.h"
 
 #include "gettext.h"
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 void
 xstdopen (void)

diff --git a/lib/xstrerror.c b/lib/xstrerror.c
index 00e2a5bc8b1e432f685df62e52761abb8b97e27e..ce65887c47133d8b5dfc49feea635b113af38e0f 100644 (file)
--- a/lib/xstrerror.c
+++ b/lib/xstrerror.c
@@ -25,7 +25,7 @@
 #include "xalloc.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 
 char *
 xstrerror (const char *message, int errnum)

diff --git a/lib/xstrtol-error.c b/lib/xstrtol-error.c
index 16a72d6773be4d53a8583b39a7934c6f6f7d6427..b11e0c4873acedddce31ef7c63408717fbde64d1 100644 (file)
--- a/lib/xstrtol-error.c
+++ b/lib/xstrtol-error.c
@@ -25,7 +25,7 @@
 #include "exitfail.h"
 #include "gettext.h"
 
-#define _(msgid) dgettext ("gnulib", msgid)
+#define _(msgid) dgettext (GNULIB_TEXT_DOMAIN, msgid)
 #define N_(msgid) msgid
 
 /* Report an error for an invalid integer in an option argument.
@@ -84,7 +84,8 @@ xstrtol_error (enum strtol_error err,
   else
     option = long_options[opt_idx].name;
 
-  error (exit_status, 0, dgettext ("gnulib", msgid), hyphens, option, arg);
+  error (exit_status, 0, dgettext (GNULIB_TEXT_DOMAIN, msgid),
+         hyphens, option, arg);
 }
 
 /* Like xstrtol_error, except exit with a failure status.  */