For many years, I found it too tedious to explicitly list the link dependency
towards $(LIBINTL). But this leads to unintended omissions of this link
dependency, e.g. in Collin's newest 'crypto/sha3-buffer' patch, with the
effect of a link error on platforms like FreeBSD, Solaris, or mingw.

So, better make this dependency explicit. Even though that it means that
when removing a dependency to 'xalloc' the 'Link:' section of a module
description might need attention.


2025-09-02  Bruno Haible  <[email protected]>

        Clarify link dependency towards libintl on FreeBSD, Solaris, etc.
        * modules/acl (Link): Document requirement to link with $(LIBINTL) or
        $(LTLIBINTL).
        * modules/areadlinkat (Link): Likewise.
        * modules/areadlinkat-with-size (Link): Likewise.
        * modules/argmatch (Link): Likewise.
        * modules/argp (Link): Likewise.
        * modules/argp-version-etc (Link): Likewise.
        * modules/backup-rename (Link): Likewise.
        * modules/backupfile (Link): Likewise.
        * modules/bitset (Link): Likewise.
        * modules/bitsetv (Link): Likewise.
        * modules/c-xvasprintf (Link): Likewise.
        * modules/canon-host (Link): Likewise.
        * modules/canonicalize (Link): Likewise.
        * modules/chdir-long (Link): Likewise.
        * modules/chmodat (Link): Likewise.
        * modules/chownat (Link): Likewise.
        * modules/classpath (Link): Likewise.
        * modules/clean-temp (Link): Likewise.
        * modules/clean-temp-simple (Link): Likewise.
        * modules/closein (Link): Likewise.
        * modules/closeout (Link): Likewise.
        * modules/copy-file (Link): Likewise.
        * modules/csharpcomp (Link): Likewise.
        * modules/csharpexec (Link): Likewise.
        * modules/cygpath (Link): Likewise.
        * modules/dfa (Link): Likewise.
        * modules/dirname (Link): Likewise.
        * modules/error (Link): Likewise.
        * modules/exclude (Link): Likewise.
        * modules/execute (Link): Likewise.
        * modules/faccessat (Link): Likewise.
        * modules/fchmodat (Link): Likewise.
        * modules/fchownat (Link): Likewise.
        * modules/fdopendir (Link): Likewise.
        * modules/fdutimensat (Link): Likewise.
        * modules/file-set (Link): Likewise.
        * modules/file-type (Link): Likewise.
        * modules/filenamecat (Link): Likewise.
        * modules/findprog (Link): Likewise.
        * modules/fstatat (Link): Likewise.
        * modules/fstrcmp (Link): Likewise.
        * modules/fts (Link): Likewise.
        * modules/getcwd (Link): Likewise.
        * modules/getlogin (Link): Likewise.
        * modules/getopt-gnu (Link): Likewise.
        * modules/getopt-posix (Link): Likewise.
        * modules/getumask (Link): Likewise.
        * modules/getusershell (Link): Likewise.
        * modules/glob (Link): Likewise.
        * modules/hamt (Link): Likewise.
        * modules/hash-triple (Link): Likewise.
        * modules/hashcode-file-inode (Link): Likewise.
        * modules/human (Link): Likewise.
        * modules/idcache (Link): Likewise.
        * modules/issymlinkat (Link): Likewise.
        * modules/javacomp (Link): Likewise.
        * modules/javaexec (Link): Likewise.
        * modules/javaversion (Link): Likewise.
        * modules/kwset (Link): Likewise.
        * modules/lchmod (Link): Likewise.
        * modules/linebuffer (Link): Likewise.
        * modules/linkat (Link): Likewise.
        * modules/list-c++ (Link): Likewise.
        * modules/long-options (Link): Likewise.
        * modules/map-c++ (Link): Likewise.
        * modules/mem-hash-map (Link): Likewise.
        * modules/mkancesdirs (Link): Likewise.
        * modules/mkdir-p (Link): Likewise.
        * modules/mkdirat (Link): Likewise.
        * modules/mkfifoat (Link): Likewise.
        * modules/modechange (Link): Likewise.
        * modules/mountlist (Link): Likewise.
        * modules/obstack (Link): Likewise.
        * modules/obstack-printf (Link): Likewise.
        * modules/obstack-printf-gnu (Link): Likewise.
        * modules/obstack-printf-posix (Link): Likewise.
        * modules/obstack-zprintf (Link): Likewise.
        * modules/obstack-zprintf-gnu (Link): Likewise.
        * modules/obstack-zprintf-posix (Link): Likewise.
        * modules/omap-c++ (Link): Likewise.
        * modules/openat (Link): Likewise.
        * modules/openat-die (Link): Likewise.
        * modules/openat-safer (Link): Likewise.
        * modules/opendirat (Link): Likewise.
        * modules/oset-c++ (Link): Likewise.
        * modules/pagealign_alloc (Link): Likewise.
        * modules/parse-datetime (Link): Likewise.
        * modules/parse-datetime2 (Link): Likewise.
        * modules/pipe-filter-gi (Link): Likewise.
        * modules/pipe-filter-ii (Link): Likewise.
        * modules/propername (Link): Likewise.
        * modules/propername-lite (Link): Likewise.
        * modules/quote (Link): Likewise.
        * modules/quotearg (Link): Likewise.
        * modules/quotearg-simple (Link): Likewise.
        * modules/readlinkat (Link): Likewise.
        * modules/readtokens (Link): Likewise.
        * modules/readtokens0 (Link): Likewise.
        * modules/readutmp (Link): Likewise.
        * modules/regex-quote (Link): Likewise.
        * modules/relocatable-lib (Link): Likewise.
        * modules/relocatable-prog (Link): Likewise.
        * modules/renameat (Link): Likewise.
        * modules/renameatu (Link): Likewise.
        * modules/same (Link): Likewise.
        * modules/save-cwd (Link): Likewise.
        * modules/savedir (Link): Likewise.
        * modules/savewd (Link): Likewise.
        * modules/selinux-at (Link): Likewise.
        * modules/set-c++ (Link): Likewise.
        * modules/sh-quote (Link): Likewise.
        * modules/sigpipe-die (Link): Likewise.
        * modules/spawn-pipe (Link): Likewise.
        * modules/stack (Link): Likewise.
        * modules/statat (Link): Likewise.
        * modules/string-desc-quotearg (Link): Likewise.
        * modules/strsignal (Link): Likewise.
        * modules/supersede (Link): Likewise.
        * modules/symlinkat (Link): Likewise.
        * modules/system-quote (Link): Likewise.
        * modules/term-style-control (Link): Likewise.
        * modules/timevar (Link): Likewise.
        * modules/trim (Link): Likewise.
        * modules/unicodeio (Link): Likewise.
        * modules/unlinkat (Link): Likewise.
        * modules/userspec (Link): Likewise.
        * modules/utimecmp (Link): Likewise.
        * modules/utimensat (Link): Likewise.
        * modules/vc-mtime (Link): Likewise.
        * modules/verror (Link): Likewise.
        * modules/version-etc (Link): Likewise.
        * modules/version-etc-fsf (Link): Likewise.
        * modules/wait-process (Link): Likewise.
        * modules/windows-cygpath (Link): Likewise.
        * modules/xalignalloc (Link): Likewise.
        * modules/xalloc (Link): Likewise.
        * modules/xalloc-die (Link): Likewise.
        * modules/xbinary-io (Link): Likewise.
        * modules/xconcat-filename (Link): Likewise.
        * modules/xfreopen (Link): Likewise.
        * modules/xgetcwd (Link): Likewise.
        * modules/xgetcwd-lgpl (Link): Likewise.
        * modules/xgetdomainname (Link): Likewise.
        * modules/xgetgroups (Link): Likewise.
        * modules/xgethostname (Link): Likewise.
        * modules/xhash (Link): Likewise.
        * modules/xlist (Link): Likewise.
        * modules/xmalloca (Link): Likewise.
        * modules/xmap (Link): Likewise.
        * modules/xmemcoll (Link): Likewise.
        * modules/xmemdup0 (Link): Likewise.
        * modules/xomap (Link): Likewise.
        * modules/xoset (Link): Likewise.
        * modules/xprintf (Link): Likewise.
        * modules/xprintf-gnu (Link): Likewise.
        * modules/xprintf-posix (Link): Likewise.
        * modules/xreadlink (Link): Likewise.
        * modules/xreadlinkat (Link): Likewise.
        * modules/xset (Link): Likewise.
        * modules/xsetenv (Link): Likewise.
        * modules/xstdopen (Link): Likewise.
        * modules/xstrerror (Link): Likewise.
        * modules/xstriconv (Link): Likewise.
        * modules/xstring-buffer (Link): Likewise.
        * modules/xstring-buffer-reversed (Link): Likewise.
        * modules/xstring-desc (Link): Likewise.
        * modules/xstrndup (Link): Likewise.
        * modules/xstrtol-error (Link): Likewise.
        * modules/xsublist (Link): Likewise.
        * modules/xvasprintf (Link): Likewise.
        * modules/xvasprintf-gnu (Link): Likewise.
        * modules/xvasprintf-posix (Link): Likewise.
        * modules/yesno (Link): Likewise.

diff --git a/modules/acl b/modules/acl
index 911f463140..3546e73eed 100644
--- a/modules/acl
+++ b/modules/acl
@@ -27,6 +27,7 @@ $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
 $(LIB_ACL)
 $(QCOPY_ACL_LIB)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/areadlinkat b/modules/areadlinkat
index 3af6ba62f1..3527e19613 100644
--- a/modules/areadlinkat
+++ b/modules/areadlinkat
@@ -29,6 +29,9 @@ lib_SOURCES += areadlinkat.c
 Include:
 "areadlink.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/areadlinkat-with-size b/modules/areadlinkat-with-size
index 1834d02484..c42a2bfe15 100644
--- a/modules/areadlinkat-with-size
+++ b/modules/areadlinkat-with-size
@@ -32,6 +32,9 @@ lib_SOURCES += areadlinkat-with-size.c
 Include:
 "areadlink.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/argmatch b/modules/argmatch
index 4d786a0f3f..9e7229a8f0 100644
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -31,6 +31,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/argp b/modules/argp
index caff9430cb..d6122adcef 100644
--- a/modules/argp
+++ b/modules/argp
@@ -53,6 +53,9 @@ lib_SOURCES += argp.h argp-ba.c argp-eexst.c \
 Include:
 "argp.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPL
 
diff --git a/modules/argp-version-etc b/modules/argp-version-etc
index 20a479c9a3..4af4ce18c9 100644
--- a/modules/argp-version-etc
+++ b/modules/argp-version-etc
@@ -15,6 +15,9 @@ lib_SOURCES += argp-version-etc.h argp-version-etc.c
 Include:
 "argp-version-etc.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/backup-rename b/modules/backup-rename
index 9872539e1b..c1e355128d 100644
--- a/modules/backup-rename
+++ b/modules/backup-rename
@@ -39,6 +39,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/backupfile b/modules/backupfile
index 40de3ae1f8..0090e22782 100644
--- a/modules/backupfile
+++ b/modules/backupfile
@@ -39,6 +39,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/bitset b/modules/bitset
index d4370c8741..d274712912 100644
--- a/modules/bitset
+++ b/modules/bitset
@@ -38,6 +38,9 @@ lib_SOURCES += bitset.c bitset/array.c bitset/stats.c \
 Include:
 "bitset.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPLv3+
 
diff --git a/modules/bitsetv b/modules/bitsetv
index 4d9be99015..48ac326f94 100644
--- a/modules/bitsetv
+++ b/modules/bitsetv
@@ -16,6 +16,9 @@ lib_SOURCES += bitsetv.c
 Include:
 "bitsetv.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPLv3+
 
diff --git a/modules/c-xvasprintf b/modules/c-xvasprintf
index 981e339bb1..59a4c5b80b 100644
--- a/modules/c-xvasprintf
+++ b/modules/c-xvasprintf
@@ -22,6 +22,9 @@ lib_SOURCES += c-xasprintf.c c-xvasprintf.c
 Include:
 "c-xvasprintf.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/canon-host b/modules/canon-host
index 8804a55d89..c1d6fe9d65 100644
--- a/modules/canon-host
+++ b/modules/canon-host
@@ -20,6 +20,9 @@ lib_SOURCES += canon-host.c
 Include:
 "canon-host.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPL
 
diff --git a/modules/canonicalize b/modules/canonicalize
index 70861a6164..941d2244ab 100644
--- a/modules/canonicalize
+++ b/modules/canonicalize
@@ -44,6 +44,9 @@ lib_SOURCES += canonicalize.c
 Include:
 "canonicalize.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/chdir-long b/modules/chdir-long
index 6582c4228d..d410c674cd 100644
--- a/modules/chdir-long
+++ b/modules/chdir-long
@@ -38,6 +38,9 @@ endif
 Include:
 "chdir-long.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/chmodat b/modules/chmodat
index b4dc230a03..6b833e84c6 100644
--- a/modules/chmodat
+++ b/modules/chmodat
@@ -16,6 +16,9 @@ lib_SOURCES += chmodat.c
 Include:
 "openat.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/chownat b/modules/chownat
index 31b6bc0ccd..02182d0da0 100644
--- a/modules/chownat
+++ b/modules/chownat
@@ -16,6 +16,9 @@ lib_SOURCES += chownat.c
 Include:
 "openat.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/classpath b/modules/classpath
index 31a353bbf9..8a5dac1030 100644
--- a/modules/classpath
+++ b/modules/classpath
@@ -18,6 +18,9 @@ lib_SOURCES += classpath.h classpath.c
 Include:
 "classpath.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/clean-temp b/modules/clean-temp
index bb36caec99..437a7e7d7a 100644
--- a/modules/clean-temp
+++ b/modules/clean-temp
@@ -42,6 +42,7 @@ Include:
 Link:
 $(GETRANDOM_LIB)
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/clean-temp-simple b/modules/clean-temp-simple
index 1517342a30..952f1497ea 100644
--- a/modules/clean-temp-simple
+++ b/modules/clean-temp-simple
@@ -34,6 +34,7 @@ Include:
 
 Link:
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 LGPLv2+
diff --git a/modules/closein b/modules/closein
index 6efdea5407..0c4e01740c 100644
--- a/modules/closein
+++ b/modules/closein
@@ -26,6 +26,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/closeout b/modules/closeout
index e9c5604c96..1dc30f8ce8 100644
--- a/modules/closeout
+++ b/modules/closeout
@@ -27,6 +27,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/copy-file b/modules/copy-file
index c63bba9a77..b273bbbf4c 100644
--- a/modules/copy-file
+++ b/modules/copy-file
@@ -42,6 +42,7 @@ $(QCOPY_ACL_LIB)
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/csharpcomp b/modules/csharpcomp
index b7ed012917..acb9a26b23 100644
--- a/modules/csharpcomp
+++ b/modules/csharpcomp
@@ -38,6 +38,7 @@ $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) 
otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/csharpexec b/modules/csharpexec
index 94138d90a2..3a9d323ce0 100644
--- a/modules/csharpexec
+++ b/modules/csharpexec
@@ -45,6 +45,7 @@ $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) 
otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/cygpath b/modules/cygpath
index 07b4c0326d..cc699393d6 100644
--- a/modules/cygpath
+++ b/modules/cygpath
@@ -19,6 +19,9 @@ lib_SOURCES += cygpath.c
 Include:
 "cygpath.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/dfa b/modules/dfa
index a3c4e44dba..eed35091b8 100644
--- a/modules/dfa
+++ b/modules/dfa
@@ -55,6 +55,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/dirname b/modules/dirname
index 483103eba5..77bfe99ee7 100644
--- a/modules/dirname
+++ b/modules/dirname
@@ -19,6 +19,9 @@ lib_SOURCES += dirname.c basename.c
 Include:
 "dirname.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/error b/modules/error
index f7fbfa6347..115387422f 100644
--- a/modules/error
+++ b/modules/error
@@ -35,6 +35,9 @@ endif
 Include:
 <error.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPLv2+
 
diff --git a/modules/exclude b/modules/exclude
index 3f2491bc49..d3ccc5be51 100644
--- a/modules/exclude
+++ b/modules/exclude
@@ -33,6 +33,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/execute b/modules/execute
index 10d3ceceeb..40dc5ce34d 100644
--- a/modules/execute
+++ b/modules/execute
@@ -48,6 +48,7 @@ Include:
 
 Link:
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/faccessat b/modules/faccessat
index ed2a338a53..d98afb4307 100644
--- a/modules/faccessat
+++ b/modules/faccessat
@@ -41,6 +41,7 @@ Include:
 
 Link:
 $(EUIDACCESS_LIBGEN)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/fchmodat b/modules/fchmodat
index 914825c1a4..b15c29b8dc 100644
--- a/modules/fchmodat
+++ b/modules/fchmodat
@@ -43,6 +43,9 @@ endif
 Include:
 <sys/stat.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/fchownat b/modules/fchownat
index e373463d0e..2a52f9b01c 100644
--- a/modules/fchownat
+++ b/modules/fchownat
@@ -34,6 +34,9 @@ endif
 Include:
 <unistd.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/fdopendir b/modules/fdopendir
index 8e55856eb0..a543a6d865 100644
--- a/modules/fdopendir
+++ b/modules/fdopendir
@@ -34,6 +34,9 @@ endif
 Include:
 <dirent.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/fdutimensat b/modules/fdutimensat
index e2cf553466..f61c624fe5 100644
--- a/modules/fdutimensat
+++ b/modules/fdutimensat
@@ -20,6 +20,9 @@ Include:
 <fcntl.h>
 "utimens.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/file-set b/modules/file-set
index d3b3a107f4..5431cdb753 100644
--- a/modules/file-set
+++ b/modules/file-set
@@ -20,6 +20,9 @@ lib_SOURCES += file-set.c
 Include:
 "file-set.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/file-type b/modules/file-type
index 42ed51a606..3f2306f11d 100644
--- a/modules/file-type
+++ b/modules/file-type
@@ -19,6 +19,9 @@ lib_SOURCES += file-type.c
 Include:
 "file-type.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/filenamecat b/modules/filenamecat
index 6339d9d246..d0e396ef8a 100644
--- a/modules/filenamecat
+++ b/modules/filenamecat
@@ -19,6 +19,9 @@ lib_SOURCES += filenamecat.c
 Include:
 "filenamecat.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/findprog b/modules/findprog
index 05a223c04e..619f089407 100644
--- a/modules/findprog
+++ b/modules/findprog
@@ -25,6 +25,9 @@ lib_SOURCES += findprog.h findprog.c
 Include:
 "findprog.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/fstatat b/modules/fstatat
index 93abb34043..c1bcf81b05 100644
--- a/modules/fstatat
+++ b/modules/fstatat
@@ -38,6 +38,9 @@ endif
 Include:
 <sys/stat.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/fstrcmp b/modules/fstrcmp
index 91040136ba..dcf508c82e 100644
--- a/modules/fstrcmp
+++ b/modules/fstrcmp
@@ -22,6 +22,9 @@ lib_SOURCES += fstrcmp.h fstrcmp.c
 Include:
 "fstrcmp.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/fts b/modules/fts
index 88b00e17f3..ac6be2cb32 100644
--- a/modules/fts
+++ b/modules/fts
@@ -64,6 +64,9 @@ MOSTLYCLEANFILES += fts_.h fts_.h-t
 Include:
 "fts_.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/getcwd b/modules/getcwd
index b21b71f7d2..0c4d66397c 100644
--- a/modules/getcwd
+++ b/modules/getcwd
@@ -52,6 +52,9 @@ endif
 Include:
 <unistd.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/getlogin b/modules/getlogin
index 7acee58a81..64f3e4fd25 100644
--- a/modules/getlogin
+++ b/modules/getlogin
@@ -26,6 +26,7 @@ Include:
 
 Link:
 $(GETLOGIN_LIB)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/getopt-gnu b/modules/getopt-gnu
index a148693e1a..09a1157c2a 100644
--- a/modules/getopt-gnu
+++ b/modules/getopt-gnu
@@ -19,6 +19,9 @@ Makefile.am:
 Include:
 <getopt.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPLv2+
 
diff --git a/modules/getopt-posix b/modules/getopt-posix
index f27f5282e4..b1f1185715 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -81,6 +81,9 @@ endif
 Include:
 <unistd.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPLv2+
 
diff --git a/modules/getumask b/modules/getumask
index 5c475a2003..9f67320f85 100644
--- a/modules/getumask
+++ b/modules/getumask
@@ -33,6 +33,7 @@ Link:
 $(GETRANDOM_LIB)
 $(CLOCK_TIME_LIB)
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/getusershell b/modules/getusershell
index a9f7fc9976..7e8346d9cc 100644
--- a/modules/getusershell
+++ b/modules/getusershell
@@ -30,6 +30,9 @@ endif
 Include:
 <unistd.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/glob b/modules/glob
index be788cb0f2..7c855debb9 100644
--- a/modules/glob
+++ b/modules/glob
@@ -62,6 +62,7 @@ Include:
 Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/hamt b/modules/hamt
index c7d6e840f6..7b6724949b 100644
--- a/modules/hamt
+++ b/modules/hamt
@@ -23,6 +23,9 @@ lib_SOURCES += hamt.c
 Include:
 "hamt.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/hash-triple b/modules/hash-triple
index 1f1cfc37a6..6a2b18c567 100644
--- a/modules/hash-triple
+++ b/modules/hash-triple
@@ -19,6 +19,9 @@ Makefile.am:
 Include:
 "hashcode-file.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/hashcode-file-inode b/modules/hashcode-file-inode
index 2e2b0ad51a..b69f9a7fc2 100644
--- a/modules/hashcode-file-inode
+++ b/modules/hashcode-file-inode
@@ -17,6 +17,9 @@ lib_SOURCES += hashcode-file-inode.c
 Include:
 "hashcode-file.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/human b/modules/human
index b62c0e2acb..9c0a7bedab 100644
--- a/modules/human
+++ b/modules/human
@@ -30,6 +30,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/idcache b/modules/idcache
index 72b7b91e62..25cfb3fe8d 100644
--- a/modules/idcache
+++ b/modules/idcache
@@ -19,6 +19,9 @@ lib_SOURCES += idcache.c
 Include:
 "idcache.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/issymlinkat b/modules/issymlinkat
index 5833bafdfb..c02e4e9678 100644
--- a/modules/issymlinkat
+++ b/modules/issymlinkat
@@ -20,6 +20,9 @@ lib_SOURCES += issymlinkat.c
 Include:
 "issymlink.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/javacomp b/modules/javacomp
index d28171f802..d58fdab9e1 100644
--- a/modules/javacomp
+++ b/modules/javacomp
@@ -49,6 +49,7 @@ $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
 $(GETRANDOM_LIB)
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/javaexec b/modules/javaexec
index dc641c21d8..061c639467 100644
--- a/modules/javaexec
+++ b/modules/javaexec
@@ -34,6 +34,7 @@ $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) 
otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/javaversion b/modules/javaversion
index b2b3273dc6..25fa5c126d 100644
--- a/modules/javaversion
+++ b/modules/javaversion
@@ -29,6 +29,7 @@ Include:
 Link:
 $(MBRTOWC_LIB)
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/kwset b/modules/kwset
index 9fb64402fd..f98165f391 100644
--- a/modules/kwset
+++ b/modules/kwset
@@ -26,6 +26,9 @@ lib_SOURCES += kwset.c
 Include:
 "kwset.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/lchmod b/modules/lchmod
index 9caa756d21..a5b3f3461f 100644
--- a/modules/lchmod
+++ b/modules/lchmod
@@ -33,6 +33,9 @@ endif
 Include:
 <sys/stat.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/linebuffer b/modules/linebuffer
index 4ddd3c38ed..b21af67ce5 100644
--- a/modules/linebuffer
+++ b/modules/linebuffer
@@ -17,6 +17,9 @@ lib_SOURCES += linebuffer.h linebuffer.c
 Include:
 "linebuffer.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/linkat b/modules/linkat
index ae53d9fddf..eb796a0be4 100644
--- a/modules/linkat
+++ b/modules/linkat
@@ -50,6 +50,9 @@ Include:
 <fcntl.h>
 <unistd.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/list-c++ b/modules/list-c++
index a3c8b0a5c3..c044b85fa9 100644
--- a/modules/list-c++
+++ b/modules/list-c++
@@ -15,6 +15,9 @@ Makefile.am:
 Include:
 "gl_list.hh"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/long-options b/modules/long-options
index 5bc7c4ca8f..54358128e9 100644
--- a/modules/long-options
+++ b/modules/long-options
@@ -21,6 +21,9 @@ lib_SOURCES += long-options.c
 Include:
 "long-options.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/map-c++ b/modules/map-c++
index e9a7058640..ea5f215b1c 100644
--- a/modules/map-c++
+++ b/modules/map-c++
@@ -14,6 +14,9 @@ Makefile.am:
 Include:
 "gl_map.hh"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/mem-hash-map b/modules/mem-hash-map
index 9a97e95dff..43f9df0059 100644
--- a/modules/mem-hash-map
+++ b/modules/mem-hash-map
@@ -18,6 +18,9 @@ lib_SOURCES += mem-hash-map.h mem-hash-map.c
 Include:
 "mem-hash-map.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/mkancesdirs b/modules/mkancesdirs
index e11fea6e4e..332adfc149 100644
--- a/modules/mkancesdirs
+++ b/modules/mkancesdirs
@@ -22,6 +22,9 @@ lib_SOURCES += mkancesdirs.c
 Include:
 "mkancesdirs.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/mkdir-p b/modules/mkdir-p
index 5bbb5aa224..9b31473607 100644
--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -36,6 +36,7 @@ Include:
 
 Link:
 $(MBRTOWC_LIB)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/mkdirat b/modules/mkdirat
index 0471bf396a..0c400d19e4 100644
--- a/modules/mkdirat
+++ b/modules/mkdirat
@@ -36,6 +36,9 @@ endif
 Include:
 <sys/stat.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/mkfifoat b/modules/mkfifoat
index 17de90fe81..336c041598 100644
--- a/modules/mkfifoat
+++ b/modules/mkfifoat
@@ -44,6 +44,9 @@ Include:
 <fcntl.h>
 <sys/stat.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/modechange b/modules/modechange
index 7d39e00be7..160aa50162 100644
--- a/modules/modechange
+++ b/modules/modechange
@@ -23,6 +23,9 @@ lib_SOURCES += modechange.c
 Include:
 "modechange.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/mountlist b/modules/mountlist
index c803f5a66b..9658435562 100644
--- a/modules/mountlist
+++ b/modules/mountlist
@@ -29,6 +29,9 @@ lib_SOURCES += mountlist.c
 Include:
 "mountlist.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/obstack b/modules/obstack
index 0d6c266ae9..615ee56b9a 100644
--- a/modules/obstack
+++ b/modules/obstack
@@ -53,6 +53,9 @@ endif
 Include:
 "obstack.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPLv2+
 
diff --git a/modules/obstack-printf b/modules/obstack-printf
index 9802bf8bf3..78eff310a2 100644
--- a/modules/obstack-printf
+++ b/modules/obstack-printf
@@ -23,6 +23,9 @@ Makefile.am:
 Include:
 <stdio.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/obstack-printf-gnu b/modules/obstack-printf-gnu
index f73d00f8cc..3d084f6c42 100644
--- a/modules/obstack-printf-gnu
+++ b/modules/obstack-printf-gnu
@@ -26,6 +26,9 @@ Makefile.am:
 Include:
 <stdio.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/obstack-printf-posix b/modules/obstack-printf-posix
index 39402c2a8c..46664fb011 100644
--- a/modules/obstack-printf-posix
+++ b/modules/obstack-printf-posix
@@ -32,6 +32,9 @@ Makefile.am:
 Include:
 <stdio.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/obstack-zprintf b/modules/obstack-zprintf
index 18ec3a17ed..7547aa58e3 100644
--- a/modules/obstack-zprintf
+++ b/modules/obstack-zprintf
@@ -19,6 +19,9 @@ lib_SOURCES += obstack_zprintf.c
 Include:
 <stdio.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/obstack-zprintf-gnu b/modules/obstack-zprintf-gnu
index 550a41c636..bf2c490df7 100644
--- a/modules/obstack-zprintf-gnu
+++ b/modules/obstack-zprintf-gnu
@@ -16,6 +16,9 @@ Makefile.am:
 Include:
 <stdio.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/obstack-zprintf-posix b/modules/obstack-zprintf-posix
index ed17a2674e..1b50f7e118 100644
--- a/modules/obstack-zprintf-posix
+++ b/modules/obstack-zprintf-posix
@@ -16,6 +16,9 @@ Makefile.am:
 Include:
 <stdio.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/omap-c++ b/modules/omap-c++
index ce1609adad..3ced723ba5 100644
--- a/modules/omap-c++
+++ b/modules/omap-c++
@@ -14,6 +14,9 @@ Makefile.am:
 Include:
 "gl_omap.hh"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/openat b/modules/openat
index 72ff45a7aa..71886a5946 100644
--- a/modules/openat
+++ b/modules/openat
@@ -44,6 +44,9 @@ endif
 Include:
 <fcntl.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/openat-die b/modules/openat-die
index 5cef137c91..455c980449 100644
--- a/modules/openat-die
+++ b/modules/openat-die
@@ -20,6 +20,9 @@ lib_SOURCES += openat-die.c
 Include:
 "openat.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/openat-safer b/modules/openat-safer
index f8194e45fc..f53424c849 100644
--- a/modules/openat-safer
+++ b/modules/openat-safer
@@ -22,6 +22,9 @@ lib_SOURCES += openat-safer.c
 Include:
 "fcntl-safer.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/opendirat b/modules/opendirat
index d62627cf7c..71b21343fc 100644
--- a/modules/opendirat
+++ b/modules/opendirat
@@ -20,6 +20,9 @@ lib_SOURCES += opendirat.c
 Include:
 "opendirat.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/oset-c++ b/modules/oset-c++
index 18dce2ffed..76980f9584 100644
--- a/modules/oset-c++
+++ b/modules/oset-c++
@@ -14,6 +14,9 @@ Makefile.am:
 Include:
 "gl_oset.hh"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/pagealign_alloc b/modules/pagealign_alloc
index bd2d8f4cbc..79f8038e8d 100644
--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -28,6 +28,9 @@ lib_SOURCES += pagealign_alloc.c
 Include:
 "pagealign_alloc.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/parse-datetime b/modules/parse-datetime
index 35cfab6802..b8b3e6d75b 100644
--- a/modules/parse-datetime
+++ b/modules/parse-datetime
@@ -63,6 +63,9 @@ EXTRA_DIST += parse-datetime.c
 Include:
 "parse-datetime.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPLv2+
 
diff --git a/modules/parse-datetime2 b/modules/parse-datetime2
index b4771dce94..ada5d508f9 100644
--- a/modules/parse-datetime2
+++ b/modules/parse-datetime2
@@ -14,6 +14,9 @@ Makefile.am:
 Include:
 "parse-datetime.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPLv2+
 
diff --git a/modules/pipe-filter-gi b/modules/pipe-filter-gi
index 002a0c27f9..7944a09fb0 100644
--- a/modules/pipe-filter-gi
+++ b/modules/pipe-filter-gi
@@ -34,6 +34,7 @@ Include:
 
 Link:
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/pipe-filter-ii b/modules/pipe-filter-ii
index 68e19e2cd9..1108ee947d 100644
--- a/modules/pipe-filter-ii
+++ b/modules/pipe-filter-ii
@@ -32,6 +32,7 @@ Include:
 
 Link:
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/propername b/modules/propername
index 87de812dc8..fe9eb20026 100644
--- a/modules/propername
+++ b/modules/propername
@@ -34,6 +34,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/propername-lite b/modules/propername-lite
index 771ea21b61..617873df63 100644
--- a/modules/propername-lite
+++ b/modules/propername-lite
@@ -20,6 +20,9 @@ lib_SOURCES += propername-lite.c propername.h
 Include:
 "propername.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPL
 
diff --git a/modules/quote b/modules/quote
index 2b74111596..7ee9b2fa6a 100644
--- a/modules/quote
+++ b/modules/quote
@@ -20,6 +20,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/quotearg b/modules/quotearg
index edf16acafe..371a55a3dd 100644
--- a/modules/quotearg
+++ b/modules/quotearg
@@ -39,6 +39,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/quotearg-simple b/modules/quotearg-simple
index e3d532defa..c7f95e9330 100644
--- a/modules/quotearg-simple
+++ b/modules/quotearg-simple
@@ -16,6 +16,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/readlinkat b/modules/readlinkat
index a5e2b3e213..bfd6f4b9df 100644
--- a/modules/readlinkat
+++ b/modules/readlinkat
@@ -35,6 +35,9 @@ Include:
 <fcntl.h>
 <unistd.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/readtokens b/modules/readtokens
index a065430bec..25f30439a4 100644
--- a/modules/readtokens
+++ b/modules/readtokens
@@ -19,6 +19,9 @@ lib_SOURCES += readtokens.c
 Include:
 "readtokens.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/readtokens0 b/modules/readtokens0
index e6a16febdd..dfb978b44d 100644
--- a/modules/readtokens0
+++ b/modules/readtokens0
@@ -17,6 +17,9 @@ lib_SOURCES += readtokens0.h readtokens0.c
 Include:
 "readtokens0.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/readutmp b/modules/readutmp
index d71aaf67c2..54470acece 100644
--- a/modules/readutmp
+++ b/modules/readutmp
@@ -31,6 +31,7 @@ Include:
 
 Link:
 $(READUTMP_LIB)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/regex-quote b/modules/regex-quote
index 8d2cfae3a0..e1e1e9631a 100644
--- a/modules/regex-quote
+++ b/modules/regex-quote
@@ -24,6 +24,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/relocatable-lib b/modules/relocatable-lib
index 7cdca5ce0a..0d59464fe6 100644
--- a/modules/relocatable-lib
+++ b/modules/relocatable-lib
@@ -25,6 +25,9 @@ Makefile.am:
 Include:
 "relocatable.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/relocatable-prog b/modules/relocatable-prog
index 3a04d3df82..475eb1d8b0 100644
--- a/modules/relocatable-prog
+++ b/modules/relocatable-prog
@@ -59,6 +59,9 @@ Include:
 "relocatable.h"
 "progname.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/renameat b/modules/renameat
index 10073c5ebd..1de99b0006 100644
--- a/modules/renameat
+++ b/modules/renameat
@@ -26,6 +26,9 @@ endif
 Include:
 <stdio.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/renameatu b/modules/renameatu
index f4f12acd13..82d8255560 100644
--- a/modules/renameatu
+++ b/modules/renameatu
@@ -38,6 +38,9 @@ lib_SOURCES += renameatu.c
 Include:
 "renameatu.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/same b/modules/same
index 4f858b1a2f..2cf9b8bfe7 100644
--- a/modules/same
+++ b/modules/same
@@ -27,6 +27,9 @@ lib_SOURCES += same.c
 Include:
 "same.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/save-cwd b/modules/save-cwd
index 119232ab0b..2bc0e68185 100644
--- a/modules/save-cwd
+++ b/modules/save-cwd
@@ -22,6 +22,9 @@ lib_SOURCES += save-cwd.c
 Include:
 "save-cwd.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/savedir b/modules/savedir
index 04253cc645..d818afc7e9 100644
--- a/modules/savedir
+++ b/modules/savedir
@@ -27,6 +27,9 @@ lib_SOURCES += savedir.c
 Include:
 "savedir.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/savewd b/modules/savewd
index c195dc7e6c..e09dbb9aed 100644
--- a/modules/savewd
+++ b/modules/savewd
@@ -31,6 +31,9 @@ lib_SOURCES += savewd.h savewd.c
 Include:
 "savewd.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/selinux-at b/modules/selinux-at
index 84bf7e4982..c6f1926bcf 100644
--- a/modules/selinux-at
+++ b/modules/selinux-at
@@ -28,6 +28,9 @@ lib_SOURCES += selinux-at.h selinux-at.c
 Include:
 "selinux-at.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/set-c++ b/modules/set-c++
index 7b999f6446..df5b2f3c09 100644
--- a/modules/set-c++
+++ b/modules/set-c++
@@ -14,6 +14,9 @@ Makefile.am:
 Include:
 "gl_set.hh"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/sh-quote b/modules/sh-quote
index 834601ba86..7ce287b63d 100644
--- a/modules/sh-quote
+++ b/modules/sh-quote
@@ -22,6 +22,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/sigpipe-die b/modules/sigpipe-die
index a840cdcc98..5fa4e9467b 100644
--- a/modules/sigpipe-die
+++ b/modules/sigpipe-die
@@ -22,6 +22,9 @@ lib_SOURCES += sigpipe-die.h sigpipe-die.c
 Include:
 "sigpipe-die.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/spawn-pipe b/modules/spawn-pipe
index 3c01e104fe..494c01bc63 100644
--- a/modules/spawn-pipe
+++ b/modules/spawn-pipe
@@ -62,6 +62,7 @@ Include:
 
 Link:
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/stack b/modules/stack
index e4da4012e4..d7763ea8c6 100644
--- a/modules/stack
+++ b/modules/stack
@@ -18,6 +18,9 @@ lib_SOURCES += stack.h
 Include:
 "stack.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/statat b/modules/statat
index bf274e054d..555325a156 100644
--- a/modules/statat
+++ b/modules/statat
@@ -23,6 +23,9 @@ lib_SOURCES += statat.c
 Include:
 "openat.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/string-desc-quotearg b/modules/string-desc-quotearg
index 915859cf3d..6852c833a4 100644
--- a/modules/string-desc-quotearg
+++ b/modules/string-desc-quotearg
@@ -22,6 +22,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/strsignal b/modules/strsignal
index f97a528150..7e8433432c 100644
--- a/modules/strsignal
+++ b/modules/strsignal
@@ -33,6 +33,9 @@ endif
 Include:
 <string.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPLv2+
 
diff --git a/modules/supersede b/modules/supersede
index 6ce5498219..36f7278c33 100644
--- a/modules/supersede
+++ b/modules/supersede
@@ -40,6 +40,7 @@ $(QCOPY_ACL_LIB)
 $(GETRANDOM_LIB)
 $(CLOCK_TIME_LIB)
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/symlinkat b/modules/symlinkat
index 797b961ee0..07d49e5ff6 100644
--- a/modules/symlinkat
+++ b/modules/symlinkat
@@ -35,6 +35,9 @@ Include:
 <fcntl.h>
 <unistd.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/system-quote b/modules/system-quote
index c8e9333a49..13e3b70e1f 100644
--- a/modules/system-quote
+++ b/modules/system-quote
@@ -23,6 +23,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/term-style-control b/modules/term-style-control
index 6a5a860773..7159604ad1 100644
--- a/modules/term-style-control
+++ b/modules/term-style-control
@@ -28,6 +28,7 @@ Include:
 
 Link:
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/timevar b/modules/timevar
index d4a645125c..754f6b7093 100644
--- a/modules/timevar
+++ b/modules/timevar
@@ -26,6 +26,9 @@ lib_SOURCES += timevar.c timevar.def
 Include:
 "timevar.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPLv3+
 
diff --git a/modules/trim b/modules/trim
index f20d8ad84e..4f8b507038 100644
--- a/modules/trim
+++ b/modules/trim
@@ -24,6 +24,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/unicodeio b/modules/unicodeio
index ada2e48b06..0b84d992bf 100644
--- a/modules/unicodeio
+++ b/modules/unicodeio
@@ -27,8 +27,9 @@ Include:
 "unicodeio.h"
 
 Link:
-$(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+$(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise
 
 License:
 GPL
diff --git a/modules/unlinkat b/modules/unlinkat
index 24232c431d..d581392f9e 100644
--- a/modules/unlinkat
+++ b/modules/unlinkat
@@ -38,6 +38,9 @@ endif
 Include:
 <unistd.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/userspec b/modules/userspec
index 4ca7741e9e..998966f9f5 100644
--- a/modules/userspec
+++ b/modules/userspec
@@ -26,6 +26,9 @@ lib_SOURCES += userspec.c
 Include:
 "userspec.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/utimecmp b/modules/utimecmp
index 13451d04c0..5ee8be1f3f 100644
--- a/modules/utimecmp
+++ b/modules/utimecmp
@@ -27,6 +27,9 @@ lib_SOURCES += utimecmp.c
 Include:
 "utimecmp.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/utimensat b/modules/utimensat
index 32d5f105c0..ed7ce25d38 100644
--- a/modules/utimensat
+++ b/modules/utimensat
@@ -35,6 +35,9 @@ endif
 Include:
 <sys/stat.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/vc-mtime b/modules/vc-mtime
index b4f74f5d36..ccdf2b5b1b 100644
--- a/modules/vc-mtime
+++ b/modules/vc-mtime
@@ -39,6 +39,9 @@ lib_SOURCES += vc-mtime.c
 Include:
 "vc-mtime.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/verror b/modules/verror
index 8fea49ad3c..755c8a701a 100644
--- a/modules/verror
+++ b/modules/verror
@@ -19,6 +19,9 @@ Makefile.am:
 Include:
 <error.h>
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/version-etc b/modules/version-etc
index beee0ac29f..0d13c4b5e7 100644
--- a/modules/version-etc
+++ b/modules/version-etc
@@ -20,6 +20,9 @@ lib_SOURCES += version-etc.h version-etc.c
 Include:
 "version-etc.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPL
 
diff --git a/modules/version-etc-fsf b/modules/version-etc-fsf
index 16663cab6c..9b239e797d 100644
--- a/modules/version-etc-fsf
+++ b/modules/version-etc-fsf
@@ -14,6 +14,9 @@ lib_SOURCES += version-etc-fsf.c
 
 Include:
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPL
 
diff --git a/modules/wait-process b/modules/wait-process
index e7bc18dace..6366994bba 100644
--- a/modules/wait-process
+++ b/modules/wait-process
@@ -32,6 +32,7 @@ Include:
 
 Link:
 $(LIBTHREAD)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/windows-cygpath b/modules/windows-cygpath
index 6575f49a62..623b0d3e8c 100644
--- a/modules/windows-cygpath
+++ b/modules/windows-cygpath
@@ -22,6 +22,9 @@ lib_SOURCES += windows-cygpath.c
 Include:
 "windows-cygpath.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xalignalloc b/modules/xalignalloc
index d336df0842..49d2e9453b 100644
--- a/modules/xalignalloc
+++ b/modules/xalignalloc
@@ -16,6 +16,9 @@ lib_SOURCES += xalignalloc.c
 Include:
 "alignalloc.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xalloc b/modules/xalloc
index 2029a1351f..f0db0e53f1 100644
--- a/modules/xalloc
+++ b/modules/xalloc
@@ -30,6 +30,9 @@ lib_SOURCES += xmalloc.c
 Include:
 "xalloc.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xalloc-die b/modules/xalloc-die
index 7636fa1929..8e72a125f6 100644
--- a/modules/xalloc-die
+++ b/modules/xalloc-die
@@ -21,6 +21,9 @@ lib_SOURCES += xalloc-die.c
 Include:
 "xalloc.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xbinary-io b/modules/xbinary-io
index 628c637cc7..c947ccfbd2 100644
--- a/modules/xbinary-io
+++ b/modules/xbinary-io
@@ -23,6 +23,9 @@ lib_SOURCES += xbinary-io.h xbinary-io.c
 Include:
 "xbinary-io.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 LGPL
 
diff --git a/modules/xconcat-filename b/modules/xconcat-filename
index 580d3d2392..dbecbd99fd 100644
--- a/modules/xconcat-filename
+++ b/modules/xconcat-filename
@@ -18,6 +18,9 @@ lib_SOURCES += xconcat-filename.c
 Include:
 "concat-filename.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xfreopen b/modules/xfreopen
index c4e87979d5..d159194d70 100644
--- a/modules/xfreopen
+++ b/modules/xfreopen
@@ -23,6 +23,7 @@ Include:
 
 Link:
 $(MBRTOWC_LIB)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/xgetcwd b/modules/xgetcwd
index f53ce3e3ca..95f630f108 100644
--- a/modules/xgetcwd
+++ b/modules/xgetcwd
@@ -25,6 +25,9 @@ lib_SOURCES += xgetcwd.c
 Include:
 "xgetcwd.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xgetcwd-lgpl b/modules/xgetcwd-lgpl
index 64e7c8f60d..78488a0a52 100644
--- a/modules/xgetcwd-lgpl
+++ b/modules/xgetcwd-lgpl
@@ -19,6 +19,9 @@ lib_SOURCES += xgetcwd.c
 Include:
 "xgetcwd.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xgetdomainname b/modules/xgetdomainname
index ec68362089..866f2785ad 100644
--- a/modules/xgetdomainname
+++ b/modules/xgetdomainname
@@ -19,6 +19,9 @@ lib_SOURCES += xgetdomainname.h xgetdomainname.c
 Include:
 "xgetdomainname.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xgetgroups b/modules/xgetgroups
index 6ae3614342..4e4f616a7f 100644
--- a/modules/xgetgroups
+++ b/modules/xgetgroups
@@ -18,6 +18,9 @@ lib_SOURCES += xgetgroups.c
 Include:
 "mgetgroups.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xgethostname b/modules/xgethostname
index ec25db0291..d4f69a769e 100644
--- a/modules/xgethostname
+++ b/modules/xgethostname
@@ -19,6 +19,9 @@ lib_SOURCES += xgethostname.h xgethostname.c
 Include:
 "xgethostname.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xhash b/modules/xhash
index 17ff779ea6..131e3529e0 100644
--- a/modules/xhash
+++ b/modules/xhash
@@ -16,6 +16,9 @@ lib_SOURCES += xhash.c
 Include:
 "hash.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPLv3+
 
diff --git a/modules/xlist b/modules/xlist
index 2dc0223616..127c74442f 100644
--- a/modules/xlist
+++ b/modules/xlist
@@ -19,6 +19,9 @@ lib_SOURCES += gl_xlist.h gl_xlist.c
 Include:
 "gl_xlist.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xmalloca b/modules/xmalloca
index 92b965b82a..42972c28c9 100644
--- a/modules/xmalloca
+++ b/modules/xmalloca
@@ -18,6 +18,9 @@ lib_SOURCES += xmalloca.c
 Include:
 "xmalloca.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xmap b/modules/xmap
index 665a401b25..67b63e1462 100644
--- a/modules/xmap
+++ b/modules/xmap
@@ -19,6 +19,9 @@ lib_SOURCES += gl_xmap.h gl_xmap.c
 Include:
 "gl_xmap.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xmemcoll b/modules/xmemcoll
index 1bb96f7887..44560f63b4 100644
--- a/modules/xmemcoll
+++ b/modules/xmemcoll
@@ -26,6 +26,7 @@ Link:
 $(LTLIBUNISTRING) when linking with libtool, $(LIBUNISTRING) otherwise
 $(MBRTOWC_LIB)
 $(LTLIBC32CONV) when linking with libtool, $(LIBC32CONV) otherwise
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL
diff --git a/modules/xmemdup0 b/modules/xmemdup0
index a82609a9df..26213e6109 100644
--- a/modules/xmemdup0
+++ b/modules/xmemdup0
@@ -16,6 +16,9 @@ lib_SOURCES += xmemdup0.h xmemdup0.c
 Include:
 "xmemdup0.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xomap b/modules/xomap
index 9649b45c2e..c0890643c1 100644
--- a/modules/xomap
+++ b/modules/xomap
@@ -19,6 +19,9 @@ lib_SOURCES += gl_xomap.h gl_xomap.c
 Include:
 "gl_xomap.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xoset b/modules/xoset
index 105b907d1e..4bc415e9d1 100644
--- a/modules/xoset
+++ b/modules/xoset
@@ -19,6 +19,9 @@ lib_SOURCES += gl_xoset.h gl_xoset.c
 Include:
 "gl_xoset.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xprintf b/modules/xprintf
index 323f83883a..4280f75b97 100644
--- a/modules/xprintf
+++ b/modules/xprintf
@@ -29,6 +29,9 @@ lib_SOURCES += xprintf.h xprintf.c
 Include:
 "xprintf.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xprintf-gnu b/modules/xprintf-gnu
index 704a5fde6d..3d47ecfcd3 100644
--- a/modules/xprintf-gnu
+++ b/modules/xprintf-gnu
@@ -23,6 +23,9 @@ Makefile.am:
 Include:
 "xprintf.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xprintf-posix b/modules/xprintf-posix
index 98e7c6df20..de839ef11f 100644
--- a/modules/xprintf-posix
+++ b/modules/xprintf-posix
@@ -23,6 +23,9 @@ Makefile.am:
 Include:
 "xprintf.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xreadlink b/modules/xreadlink
index 5b14ece960..8591b5db69 100644
--- a/modules/xreadlink
+++ b/modules/xreadlink
@@ -17,6 +17,9 @@ lib_SOURCES += xreadlink.c
 Include:
 "xreadlink.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xreadlinkat b/modules/xreadlinkat
index 81f87de479..edcb1ca9af 100644
--- a/modules/xreadlinkat
+++ b/modules/xreadlinkat
@@ -18,6 +18,9 @@ lib_SOURCES += xreadlinkat.c
 Include:
 "xreadlink.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xset b/modules/xset
index 4187e56be5..5cf7f06b50 100644
--- a/modules/xset
+++ b/modules/xset
@@ -19,6 +19,9 @@ lib_SOURCES += gl_xset.h gl_xset.c
 Include:
 "gl_xset.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xsetenv b/modules/xsetenv
index ffdccec12c..3e3c8267b9 100644
--- a/modules/xsetenv
+++ b/modules/xsetenv
@@ -22,6 +22,9 @@ lib_SOURCES += xsetenv.h xsetenv.c
 Include:
 "xsetenv.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xstdopen b/modules/xstdopen
index 90880cb5a6..edf6b09181 100644
--- a/modules/xstdopen
+++ b/modules/xstdopen
@@ -21,6 +21,9 @@ lib_SOURCES += xstdopen.c
 Include:
 "xstdopen.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xstrerror b/modules/xstrerror
index edf72efc60..a1c5c35a3b 100644
--- a/modules/xstrerror
+++ b/modules/xstrerror
@@ -21,6 +21,9 @@ lib_SOURCES += xstrerror.c
 Include:
 "xstrerror.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xstriconv b/modules/xstriconv
index a052aeac85..afe83ab27a 100644
--- a/modules/xstriconv
+++ b/modules/xstriconv
@@ -18,6 +18,9 @@ lib_SOURCES += xstriconv.h xstriconv.c
 Include:
 "xstriconv.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xstring-buffer b/modules/xstring-buffer
index 19497312ee..1515eca115 100644
--- a/modules/xstring-buffer
+++ b/modules/xstring-buffer
@@ -18,6 +18,9 @@ lib_SOURCES += xstring-buffer.c xstring-buffer-printf.c
 Include:
 "string-buffer.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xstring-buffer-reversed b/modules/xstring-buffer-reversed
index f4b8091d27..ab81873814 100644
--- a/modules/xstring-buffer-reversed
+++ b/modules/xstring-buffer-reversed
@@ -18,6 +18,9 @@ lib_SOURCES += xstring-buffer-reversed.c 
xstring-buffer-reversed-printf.c
 Include:
 "string-buffer-reversed.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xstring-desc b/modules/xstring-desc
index 5653853686..3cd6812e8d 100644
--- a/modules/xstring-desc
+++ b/modules/xstring-desc
@@ -18,6 +18,9 @@ lib_SOURCES += xstring-desc.c
 Include:
 "xstring-desc.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xstrndup b/modules/xstrndup
index dfd72a7a4d..891f394783 100644
--- a/modules/xstrndup
+++ b/modules/xstrndup
@@ -19,6 +19,9 @@ lib_SOURCES += xstrndup.h xstrndup.c
 Include:
 "xstrndup.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xstrtol-error b/modules/xstrtol-error
index 60319acc7f..674e2f7290 100644
--- a/modules/xstrtol-error
+++ b/modules/xstrtol-error
@@ -21,6 +21,9 @@ lib_SOURCES += xstrtol-error.c
 Include:
 "xstrtol-error.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xsublist b/modules/xsublist
index 38c4b3086c..c8f79c79dd 100644
--- a/modules/xsublist
+++ b/modules/xsublist
@@ -18,6 +18,9 @@ lib_SOURCES += gl_xsublist.h gl_xsublist.c
 Include:
 "gl_xsublist.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xvasprintf b/modules/xvasprintf
index fbee31d1e5..eee47b1720 100644
--- a/modules/xvasprintf
+++ b/modules/xvasprintf
@@ -31,6 +31,9 @@ lib_SOURCES += xvasprintf.h xvasprintf.c xasprintf.c
 Include:
 "xvasprintf.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xvasprintf-gnu b/modules/xvasprintf-gnu
index e458046b6a..289b008bc6 100644
--- a/modules/xvasprintf-gnu
+++ b/modules/xvasprintf-gnu
@@ -21,6 +21,9 @@ Makefile.am:
 Include:
 "xvasprintf.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/xvasprintf-posix b/modules/xvasprintf-posix
index 481f8761e7..e220034eec 100644
--- a/modules/xvasprintf-posix
+++ b/modules/xvasprintf-posix
@@ -21,6 +21,9 @@ Makefile.am:
 Include:
 "xvasprintf.h"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
 GPL
 
diff --git a/modules/yesno b/modules/yesno
index a8285b6c4f..fa5c201180 100644
--- a/modules/yesno
+++ b/modules/yesno
@@ -23,6 +23,7 @@ Include:
 
 Link:
 $(MBRTOWC_LIB)
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
 GPL




Reply via email to