Fix link errors with --enable-threads=posix on AIX.

* modules/mbrtowc (Link): New section.
* modules/acl (Link): Likewise.
* modules/argmatch (Link): Likewise.
* modules/backup-rename (Link): Likewise.
* modules/backupfile (Link): Likewise.
* modules/closein (Link): Likewise.
* modules/closeout (Link): Likewise.
* modules/copy-file (Link): Likewise.
* modules/csharpcomp (Link): Likewise.
* modules/csharpexec (Link): Likewise.
* modules/dfa (Link): Likewise.
* modules/exclude (Link): Likewise.
* modules/fnmatch (Link): Likewise.
* modules/fnmatch-gnu (Link): Likewise.
* modules/fnmatch-posix (Link): Likewise.
* modules/glob (Link): Likewise.
* modules/human (Link): Likewise.
* modules/javacomp (Link): Likewise.
* modules/javaexec (Link): Likewise.
* modules/javaversion (Link): Likewise.
* modules/mbfile (Link): Likewise.
* modules/mbiter (Link): Likewise.
* modules/mbmemcasecmp (Link): Likewise.
* modules/mbmemcasecoll (Link): Likewise.
* modules/mbrlen (Link): Likewise.
* modules/mbscasecmp (Link): Likewise.
* modules/mbscasestr (Link): Likewise.
* modules/mbschr (Link): Likewise.
* modules/mbscspn (Link): Likewise.
* modules/mbsinit (Link): Likewise.
* modules/mbslen (Link): Likewise.
* modules/mbsncasecmp (Link): Likewise.
* modules/mbsnlen (Link): Likewise.
* modules/mbsnrtowcs (Link): Likewise.
* modules/mbspbrk (Link): Likewise.
* modules/mbspcasecmp (Link): Likewise.
* modules/mbsrchr (Link): Likewise.
* modules/mbsrtowcs (Link): Likewise.
* modules/mbssep (Link): Likewise.
* modules/mbsspn (Link): Likewise.
* modules/mbsstr (Link): Likewise.
* modules/mbstok_r (Link): Likewise.
* modules/mbswidth (Link): Likewise.
* modules/mbuiter (Link): Likewise.
* modules/mkdir-p (Link): Likewise.
* modules/propername (Link): Likewise.
* modules/quote (Link): Likewise.
* modules/quotearg (Link): Likewise.
* modules/quotearg-simple (Link): Likewise.
* modules/regex-quote (Link): Likewise.
* modules/rpmatch (Link): Likewise.
* modules/sh-quote (Link): Likewise.
* modules/system-quote (Link): Likewise.
* modules/trim (Link): Likewise.
* modules/unistdio/ulc-asnprintf (Link): Likewise.
* modules/unistdio/ulc-fprintf (Link): Likewise.
* modules/unistdio/ulc-vasnprintf (Link): Likewise.
* modules/unistdio/ulc-vasprintf (Link): Likewise.
* modules/unistdio/ulc-vfprintf (Link): Likewise.
* modules/unistdio/ulc-vsnprintf (Link): Likewise.
* modules/unistdio/ulc-vsprintf (Link): Likewise.
* modules/xfreopen (Link): Likewise.
* modules/xmemcoll (Link): Likewise.
* modules/yesno (Link): Likewise.
* modules/acl-tests (Makefile.am): Link the programs with $(LIBTHREAD).
* modules/argmatch-tests (Makefile.am): Likewise.
* modules/closein-tests (Makefile.am): Likewise.
* modules/copy-file-tests (Makefile.am): Likewise.
* modules/dfa-tests (Makefile.am): Likewise.
* modules/fnmatch-tests (Makefile.am): Likewise.
* modules/glob-tests (Makefile.am): Likewise.
* modules/mbmemcasecmp-tests (Makefile.am): Likewise.
* modules/mbmemcasecoll-tests (Makefile.am): Likewise.
* modules/mbrtowc-tests (Makefile.am): Likewise.
* modules/mbscasecmp-tests (Makefile.am): Likewise.
* modules/mbscasestr-tests (Makefile.am): Likewise.
* modules/mbschr-tests (Makefile.am): Likewise.
* modules/mbscspn-tests (Makefile.am): Likewise.
* modules/mbsinit-tests (Makefile.am): Likewise.
* modules/mbsncasecmp-tests (Makefile.am): Likewise.
* modules/mbsnrtowcs-tests (Makefile.am): Likewise.
* modules/mbspbrk-tests (Makefile.am): Likewise.
* modules/mbspcasecmp-tests (Makefile.am): Likewise.
* modules/mbsrchr-tests (Makefile.am): Likewise.
* modules/mbsrtowcs-tests (Makefile.am): Likewise.
* modules/mbsspn-tests (Makefile.am): Likewise.
* modules/mbsstr-tests (Makefile.am): Likewise.
* modules/quotearg-tests (Makefile.am): Likewise.
* modules/quotearg-simple-tests (Makefile.am): Likewise.
* modules/readtokens-tests (Makefile.am): Likewise.
* modules/regex-quote-tests (Makefile.am): Likewise.
* modules/sh-quote-tests (Makefile.am): Likewise.
* modules/system-quote-tests (Makefile.am): Likewise.
* modules/unistdio/ulc-asnprintf-tests (Makefile.am): Likewise.
* modules/unistdio/ulc-vasnprintf-tests (Makefile.am): Likewise.
* modules/unistdio/ulc-vasprintf-tests (Makefile.am): Likewise.
* modules/unistdio/ulc-vsnprintf-tests (Makefile.am): Likewise.
* modules/unistdio/ulc-vsprintf-tests (Makefile.am): Likewise.
* modules/yesno-tests (Makefile.am): Likewise.

99 files changed, 234 insertions, 36 deletions

diff --git a/modules/acl b/modules/acl
index 83422bcf45..9c398dddbb 100644
--- a/modules/acl
+++ b/modules/acl
@@ -21,6 +21,9 @@ lib_SOURCES += copy-acl.c set-acl.c
 Include:
 "acl.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/acl-tests b/modules/acl-tests
index 76e2a36173..1c6b7c41cb 100644
--- a/modules/acl-tests
+++ b/modules/acl-tests
@@ -25,6 +25,6 @@ TESTS += \
   test-copy-acl.sh test-copy-acl-1.sh test-copy-acl-2.sh
 TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-set-mode-acl test-copy-acl test-sameacls
-test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
-test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
-test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@
+test_set_mode_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(LIBTHREAD)
+test_copy_acl_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(LIBTHREAD)
+test_sameacls_LDADD = $(LDADD) $(LIB_ACL) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/argmatch b/modules/argmatch
index 7814eba797..7fdbe66161 100644
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -26,6 +26,9 @@ lib_SOURCES += argmatch.c
 Include:
 "argmatch.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/argmatch-tests b/modules/argmatch-tests
index cc02852bab..1b2f3c4ea4 100644
--- a/modules/argmatch-tests
+++ b/modules/argmatch-tests
@@ -9,5 +9,5 @@ configure.ac:
 Makefile.am:
 TESTS += test-argmatch
 check_PROGRAMS += test-argmatch
-test_argmatch_LDADD = $(LDADD) @LIBINTL@
+test_argmatch_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
 
diff --git a/modules/backup-rename b/modules/backup-rename
index 3cb37ddcf5..65ebe45eb7 100644
--- a/modules/backup-rename
+++ b/modules/backup-rename
@@ -32,6 +32,9 @@ lib_SOURCES += backupfile.c backup-rename.c
 Include:
 "backupfile.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/backupfile b/modules/backupfile
index 429faa6bf3..67c79716c8 100644
--- a/modules/backupfile
+++ b/modules/backupfile
@@ -33,6 +33,9 @@ lib_SOURCES += backupfile.c backup-find.c
 Include:
 "backupfile.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/closein b/modules/closein
index 6eb7b206bb..a5e8a535a7 100644
--- a/modules/closein
+++ b/modules/closein
@@ -19,6 +19,9 @@ lib_SOURCES += closein.c
 Include:
 "closein.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/closein-tests b/modules/closein-tests
index 1cc6609777..bffa63afb7 100644
--- a/modules/closein-tests
+++ b/modules/closein-tests
@@ -12,4 +12,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-closein.sh
 check_PROGRAMS += test-closein
-test_closein_LDADD = $(LDADD) @LIBINTL@
+test_closein_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/closeout b/modules/closeout
index 82e91a7feb..5482357754 100644
--- a/modules/closeout
+++ b/modules/closeout
@@ -21,6 +21,9 @@ lib_SOURCES += closeout.c
 Include:
 "closeout.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/copy-file b/modules/copy-file
index bc1527757d..36d25af8ae 100644
--- a/modules/copy-file
+++ b/modules/copy-file
@@ -33,6 +33,9 @@ lib_SOURCES += copy-file.h copy-file.c
 Include:
 "copy-file.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/copy-file-tests b/modules/copy-file-tests
index 6b468afbfc..d33de798ad 100644
--- a/modules/copy-file-tests
+++ b/modules/copy-file-tests
@@ -18,4 +18,4 @@ Makefile.am:
 TESTS += test-copy-file.sh test-copy-file-1.sh test-copy-file-2.sh
 TESTS_ENVIRONMENT += USE_ACL=$(USE_ACL)
 check_PROGRAMS += test-copy-file
-test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(LIB_CLOCK_GETTIME) @LIBINTL@
+test_copy_file_LDADD = $(LDADD) $(LIB_ACL) $(LIB_CLOCK_GETTIME) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/csharpcomp b/modules/csharpcomp
index e0e539ec2b..9afcefa44f 100644
--- a/modules/csharpcomp
+++ b/modules/csharpcomp
@@ -27,6 +27,9 @@ lib_SOURCES += csharpcomp.h csharpcomp.c
 Include:
 "csharpcomp.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/csharpexec b/modules/csharpexec
index af5bbfd88f..ed1723a21d 100644
--- a/modules/csharpexec
+++ b/modules/csharpexec
@@ -27,6 +27,9 @@ lib_SOURCES += csharpexec.h csharpexec.c
 Include:
 "csharpexec.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/dfa b/modules/dfa
index 504e7f00fd..ee5bec85d8 100644
--- a/modules/dfa
+++ b/modules/dfa
@@ -36,6 +36,9 @@ Include:
 "dfa.h"
 "localeinfo.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/dfa-tests b/modules/dfa-tests
index 9f00d8125d..ee4354a268 100644
--- a/modules/dfa-tests
+++ b/modules/dfa-tests
@@ -18,4 +18,4 @@ TESTS +=			\
   dfa-match.sh
 
 check_PROGRAMS += dfa-match-aux
-dfa_match_aux_LDADD = $(LDADD) @LIBINTL@
+dfa_match_aux_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/exclude b/modules/exclude
index 04fb0e5ebe..d05fdb2b85 100644
--- a/modules/exclude
+++ b/modules/exclude
@@ -24,6 +24,9 @@ lib_SOURCES += exclude.c
 Include:
 "exclude.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/fnmatch b/modules/fnmatch
index 5f2bf9cb04..67224571f9 100644
--- a/modules/fnmatch
+++ b/modules/fnmatch
@@ -33,6 +33,9 @@ Makefile.am:
 Include:
 <fnmatch.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv2+
 
diff --git a/modules/fnmatch-gnu b/modules/fnmatch-gnu
index 86b522547e..8a592f236e 100644
--- a/modules/fnmatch-gnu
+++ b/modules/fnmatch-gnu
@@ -19,6 +19,9 @@ Makefile.am:
 Include:
 <fnmatch.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv2+
 
diff --git a/modules/fnmatch-posix b/modules/fnmatch-posix
index 1676a76ec5..f1e5b69dbb 100644
--- a/modules/fnmatch-posix
+++ b/modules/fnmatch-posix
@@ -19,6 +19,9 @@ Makefile.am:
 Include:
 "fnmatch.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv2+
 
diff --git a/modules/fnmatch-tests b/modules/fnmatch-tests
index cb16de436c..55c94cb807 100644
--- a/modules/fnmatch-tests
+++ b/modules/fnmatch-tests
@@ -6,3 +6,4 @@ tests/macros.h
 Makefile.am:
 TESTS += test-fnmatch
 check_PROGRAMS += test-fnmatch
+test_fnmatch_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/glob b/modules/glob
index 88bfce2301..0f7dad6f92 100644
--- a/modules/glob
+++ b/modules/glob
@@ -49,6 +49,9 @@ Makefile.am:
 Include:
 <glob.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv2+
 
diff --git a/modules/glob-tests b/modules/glob-tests
index 3adbe6c80e..5e83c4350c 100644
--- a/modules/glob-tests
+++ b/modules/glob-tests
@@ -11,3 +11,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-glob
 check_PROGRAMS += test-glob
+test_glob_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/human b/modules/human
index 2ad48f28fb..362b8582fb 100644
--- a/modules/human
+++ b/modules/human
@@ -26,6 +26,9 @@ lib_SOURCES += human.c
 Include:
 "human.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/javacomp b/modules/javacomp
index 2568a9e54c..082a6c599a 100644
--- a/modules/javacomp
+++ b/modules/javacomp
@@ -38,6 +38,9 @@ lib_SOURCES += javacomp.h javacomp.c
 Include:
 "javacomp.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/javaexec b/modules/javaexec
index 879580a12d..04b997b447 100644
--- a/modules/javaexec
+++ b/modules/javaexec
@@ -28,6 +28,9 @@ lib_SOURCES += javaexec.h javaexec.c
 Include:
 "javaexec.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/javaversion b/modules/javaversion
index 83df24a6cf..b86edb008b 100644
--- a/modules/javaversion
+++ b/modules/javaversion
@@ -25,6 +25,9 @@ pkgdata_DATA += javaversion.class
 Include:
 "javaversion.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/mbfile b/modules/mbfile
index c57a3d5ba6..386f3e93e9 100644
--- a/modules/mbfile
+++ b/modules/mbfile
@@ -24,6 +24,9 @@ lib_SOURCES += mbfile.h mbfile.c
 Include:
 "mbfile.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbiter b/modules/mbiter
index 6375652bff..347e7776e0 100644
--- a/modules/mbiter
+++ b/modules/mbiter
@@ -24,6 +24,9 @@ lib_SOURCES += mbiter.h mbiter.c
 Include:
 "mbiter.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv2+
 
diff --git a/modules/mbmemcasecmp b/modules/mbmemcasecmp
index f075720517..22075b568e 100644
--- a/modules/mbmemcasecmp
+++ b/modules/mbmemcasecmp
@@ -16,6 +16,9 @@ lib_SOURCES += mbmemcasecmp.c
 Include:
 "mbmemcasecmp.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests
index e863f6d960..29c8cf68fe 100644
--- a/modules/mbmemcasecmp-tests
+++ b/modules/mbmemcasecmp-tests
@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbmemcasecmp
-
+test_mbmemcasecmp_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbmemcasecoll b/modules/mbmemcasecoll
index 13da471fd0..e0674fa47f 100644
--- a/modules/mbmemcasecoll
+++ b/modules/mbmemcasecoll
@@ -23,6 +23,9 @@ lib_SOURCES += mbmemcasecoll.c
 Include:
 "mbmemcasecoll.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests
index 8c834d72f1..fb308d993d 100644
--- a/modules/mbmemcasecoll-tests
+++ b/modules/mbmemcasecoll-tests
@@ -25,4 +25,4 @@ TESTS_ENVIRONMENT += \
   LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \
   LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbmemcasecoll
-
+test_mbmemcasecoll_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbrlen b/modules/mbrlen
index e3b6c5aded..e1caa2a879 100644
--- a/modules/mbrlen
+++ b/modules/mbrlen
@@ -24,6 +24,9 @@ Makefile.am:
 Include:
 <wchar.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbrtowc b/modules/mbrtowc
index 83f34282df..9c3efe1909 100644
--- a/modules/mbrtowc
+++ b/modules/mbrtowc
@@ -33,6 +33,9 @@ Makefile.am:
 Include:
 <wchar.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv2+
 
diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests
index fe948c3944..a2839cbd72 100644
--- a/modules/mbrtowc-tests
+++ b/modules/mbrtowc-tests
@@ -41,3 +41,4 @@ TESTS_ENVIRONMENT += \
   LOCALE_JA='@LOCALE_JA@' \
   LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbrtowc test-mbrtowc-w32
+test_mbrtowc_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbscasecmp b/modules/mbscasecmp
index f453ffcaf1..2be11e0d10 100644
--- a/modules/mbscasecmp
+++ b/modules/mbscasecmp
@@ -17,6 +17,9 @@ lib_SOURCES += mbscasecmp.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests
index 460e998a9f..8548050dd6 100644
--- a/modules/mbscasecmp-tests
+++ b/modules/mbscasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbscasecmp.sh
 TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbscasecmp
-
+test_mbscasecmp_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbscasestr b/modules/mbscasestr
index 939b6e4964..a731dd06c0 100644
--- a/modules/mbscasestr
+++ b/modules/mbscasestr
@@ -22,6 +22,9 @@ lib_SOURCES += mbscasestr.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests
index 15d5c97493..bc2df73cc7 100644
--- a/modules/mbscasestr-tests
+++ b/modules/mbscasestr-tests
@@ -24,4 +24,7 @@ Makefile.am:
 TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasestr4.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbscasestr1 test-mbscasestr2 test-mbscasestr3 test-mbscasestr4
-
+test_mbscasestr1_LDADD = $(LDADD) $(LIBTHREAD)
+test_mbscasestr2_LDADD = $(LDADD) $(LIBTHREAD)
+test_mbscasestr3_LDADD = $(LDADD) $(LIBTHREAD)
+test_mbscasestr4_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbschr b/modules/mbschr
index c9ec28d7b0..ca67f300ef 100644
--- a/modules/mbschr
+++ b/modules/mbschr
@@ -17,6 +17,9 @@ lib_SOURCES += mbschr.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbschr-tests b/modules/mbschr-tests
index 773eb00042..f04e03c5d4 100644
--- a/modules/mbschr-tests
+++ b/modules/mbschr-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbschr.sh
 TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbschr
-
+test_mbschr_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbscspn b/modules/mbscspn
index 680e826c8f..6861e61a3d 100644
--- a/modules/mbscspn
+++ b/modules/mbscspn
@@ -19,6 +19,9 @@ lib_SOURCES += mbscspn.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests
index 3052a3b337..a6eada177b 100644
--- a/modules/mbscspn-tests
+++ b/modules/mbscspn-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbscspn.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbscspn
-
+test_mbscspn_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbsinit b/modules/mbsinit
index eb611c360e..941c583889 100644
--- a/modules/mbsinit
+++ b/modules/mbsinit
@@ -25,6 +25,9 @@ Makefile.am:
 Include:
 <wchar.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv2+
 
diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests
index 5225c36675..e509efed3f 100644
--- a/modules/mbsinit-tests
+++ b/modules/mbsinit-tests
@@ -17,4 +17,4 @@ Makefile.am:
 TESTS += test-mbsinit.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbsinit
-
+test_mbsinit_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbslen b/modules/mbslen
index 5af2128ba3..ed8dfe7fbe 100644
--- a/modules/mbslen
+++ b/modules/mbslen
@@ -19,6 +19,9 @@ lib_SOURCES += mbslen.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbsncasecmp b/modules/mbsncasecmp
index 8f46b62721..2857f4f816 100644
--- a/modules/mbsncasecmp
+++ b/modules/mbsncasecmp
@@ -17,6 +17,9 @@ lib_SOURCES += mbsncasecmp.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests
index 1844904ec0..ad04325bd9 100644
--- a/modules/mbsncasecmp-tests
+++ b/modules/mbsncasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbsncasecmp.sh
 TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbsncasecmp
-
+test_mbsncasecmp_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbsnlen b/modules/mbsnlen
index 9be1cddb96..fa2296400f 100644
--- a/modules/mbsnlen
+++ b/modules/mbsnlen
@@ -17,6 +17,9 @@ lib_SOURCES += mbsnlen.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv2+
 
diff --git a/modules/mbsnrtowcs b/modules/mbsnrtowcs
index 2ad4814f5a..b1a9721c0f 100644
--- a/modules/mbsnrtowcs
+++ b/modules/mbsnrtowcs
@@ -29,6 +29,9 @@ Makefile.am:
 Include:
 <wchar.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests
index 1a53405fb6..ac67c854bb 100644
--- a/modules/mbsnrtowcs-tests
+++ b/modules/mbsnrtowcs-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
   LOCALE_JA='@LOCALE_JA@' \
   LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbsnrtowcs
-
+test_mbsnrtowcs_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbspbrk b/modules/mbspbrk
index 2851f2f2b6..77bf03fc5a 100644
--- a/modules/mbspbrk
+++ b/modules/mbspbrk
@@ -19,6 +19,9 @@ lib_SOURCES += mbspbrk.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests
index 77a305af6d..587ff5dcc3 100644
--- a/modules/mbspbrk-tests
+++ b/modules/mbspbrk-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbspbrk.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbspbrk
-
+test_mbspbrk_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbspcasecmp b/modules/mbspcasecmp
index fde5e7350a..9e8753697b 100644
--- a/modules/mbspcasecmp
+++ b/modules/mbspcasecmp
@@ -17,6 +17,9 @@ lib_SOURCES += mbspcasecmp.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests
index 5f38e22de2..e1b87c36a2 100644
--- a/modules/mbspcasecmp-tests
+++ b/modules/mbspcasecmp-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbspcasecmp.sh
 TESTS_ENVIRONMENT += LOCALE_TR_UTF8='@LOCALE_TR_UTF8@'
 check_PROGRAMS += test-mbspcasecmp
-
+test_mbspcasecmp_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbsrchr b/modules/mbsrchr
index 12a9dafee7..b73b59f70a 100644
--- a/modules/mbsrchr
+++ b/modules/mbsrchr
@@ -17,6 +17,9 @@ lib_SOURCES += mbsrchr.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests
index d848037be3..326d566d6f 100644
--- a/modules/mbsrchr-tests
+++ b/modules/mbsrchr-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbsrchr.sh
 TESTS_ENVIRONMENT += LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbsrchr
-
+test_mbsrchr_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbsrtowcs b/modules/mbsrtowcs
index d4e5e6fdf4..c742f49d3b 100644
--- a/modules/mbsrtowcs
+++ b/modules/mbsrtowcs
@@ -32,6 +32,9 @@ Makefile.am:
 Include:
 <wchar.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv2+
 
diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests
index 74dcd6370d..24dfa3f78b 100644
--- a/modules/mbsrtowcs-tests
+++ b/modules/mbsrtowcs-tests
@@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \
   LOCALE_JA='@LOCALE_JA@' \
   LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbsrtowcs
-
+test_mbsrtowcs_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbssep b/modules/mbssep
index 74f083a7c1..465dc51143 100644
--- a/modules/mbssep
+++ b/modules/mbssep
@@ -19,6 +19,9 @@ lib_SOURCES += mbssep.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbsspn b/modules/mbsspn
index ad548b41a4..6cec1da2e0 100644
--- a/modules/mbsspn
+++ b/modules/mbsspn
@@ -18,6 +18,9 @@ lib_SOURCES += mbsspn.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests
index ed7e47abb7..8a5fe23396 100644
--- a/modules/mbsspn-tests
+++ b/modules/mbsspn-tests
@@ -15,4 +15,4 @@ Makefile.am:
 TESTS += test-mbsspn.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-mbsspn
-
+test_mbsspn_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbsstr b/modules/mbsstr
index 21d683858f..5b418dce22 100644
--- a/modules/mbsstr
+++ b/modules/mbsstr
@@ -22,6 +22,9 @@ lib_SOURCES += mbsstr.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests
index 01e605d8f2..a0a878b1f0 100644
--- a/modules/mbsstr-tests
+++ b/modules/mbsstr-tests
@@ -20,4 +20,6 @@ Makefile.am:
 TESTS += test-mbsstr1 test-mbsstr2.sh test-mbsstr3.sh
 TESTS_ENVIRONMENT += LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@'
 check_PROGRAMS += test-mbsstr1 test-mbsstr2 test-mbsstr3
-
+test_mbsstr1_LDADD = $(LDADD) $(LIBTHREAD)
+test_mbsstr2_LDADD = $(LDADD) $(LIBTHREAD)
+test_mbsstr3_LDADD = $(LDADD) $(LIBTHREAD)
diff --git a/modules/mbstok_r b/modules/mbstok_r
index 5fdcaa0f7b..67de3d772a 100644
--- a/modules/mbstok_r
+++ b/modules/mbstok_r
@@ -20,6 +20,9 @@ lib_SOURCES += mbstok_r.c
 Include:
 <string.h>
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mbswidth b/modules/mbswidth
index a34dd28eda..934ab5924a 100644
--- a/modules/mbswidth
+++ b/modules/mbswidth
@@ -25,6 +25,9 @@ lib_SOURCES += mbswidth.h mbswidth.c
 Include:
 "mbswidth.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/mbuiter b/modules/mbuiter
index bf149bda26..6763f0bb56 100644
--- a/modules/mbuiter
+++ b/modules/mbuiter
@@ -25,6 +25,9 @@ lib_SOURCES += mbuiter.h mbuiter.c
 Include:
 "mbuiter.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPL
 
diff --git a/modules/mkdir-p b/modules/mkdir-p
index 479b92e877..72f8b0987a 100644
--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -33,6 +33,9 @@ lib_SOURCES += dirchownmod.c mkdir-p.c
 Include:
 "mkdir-p.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/propername b/modules/propername
index c9241846d1..22d60735a9 100644
--- a/modules/propername
+++ b/modules/propername
@@ -35,6 +35,9 @@ lib_SOURCES += propername.h propername.c
 Include:
 "propername.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/quote b/modules/quote
index d55d2bfedf..a01a16d1fc 100644
--- a/modules/quote
+++ b/modules/quote
@@ -16,6 +16,9 @@ Makefile.am:
 Include:
 "quote.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/quotearg b/modules/quotearg
index 109a16de54..3d56dc53bb 100644
--- a/modules/quotearg
+++ b/modules/quotearg
@@ -34,6 +34,9 @@ lib_SOURCES += quotearg.c
 Include:
 "quotearg.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/quotearg-simple b/modules/quotearg-simple
index f91c0f3275..5ba13ce235 100644
--- a/modules/quotearg-simple
+++ b/modules/quotearg-simple
@@ -12,6 +12,9 @@ Makefile.am:
 
 Include:
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/quotearg-simple-tests b/modules/quotearg-simple-tests
index 3c932f037a..701da5f1e9 100644
--- a/modules/quotearg-simple-tests
+++ b/modules/quotearg-simple-tests
@@ -18,4 +18,4 @@ AC_CHECK_FUNCS_ONCE([mprotect])
 Makefile.am:
 TESTS += test-quotearg-simple
 check_PROGRAMS += test-quotearg-simple
-test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@
+test_quotearg_simple_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/quotearg-tests b/modules/quotearg-tests
index 885d4596ff..61aa27ce74 100644
--- a/modules/quotearg-tests
+++ b/modules/quotearg-tests
@@ -27,4 +27,4 @@ Makefile.am:
 TESTS += test-quotearg.sh
 TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-quotearg
-test_quotearg_LDADD = $(LDADD) @LIBINTL@
+test_quotearg_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/readtokens-tests b/modules/readtokens-tests
index e29c2ff351..5e83e47c43 100644
--- a/modules/readtokens-tests
+++ b/modules/readtokens-tests
@@ -11,4 +11,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-readtokens.sh
 check_PROGRAMS += test-readtokens
-test_readtokens_LDADD = $(LDADD) @LIBINTL@
+test_readtokens_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/regex-quote b/modules/regex-quote
index ae27afcaf9..085e5b6bc7 100644
--- a/modules/regex-quote
+++ b/modules/regex-quote
@@ -18,6 +18,9 @@ lib_SOURCES += regex-quote.c
 Include:
 "regex-quote.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/regex-quote-tests b/modules/regex-quote-tests
index a1a63cd8b5..b396a007a7 100644
--- a/modules/regex-quote-tests
+++ b/modules/regex-quote-tests
@@ -11,4 +11,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-regex-quote
 check_PROGRAMS += test-regex-quote
-test_regex_quote_LDADD = $(LDADD) $(LIBINTL)
+test_regex_quote_LDADD = $(LDADD) $(LIBINTL) $(LIBTHREAD)
diff --git a/modules/rpmatch b/modules/rpmatch
index f64286b415..3b754c6701 100644
--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -27,6 +27,7 @@ Include:
 <stdlib.h>
 
 Link:
+$(LIBTHREAD)
 $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
diff --git a/modules/sh-quote b/modules/sh-quote
index 4581cbd0b5..a95dea9af6 100644
--- a/modules/sh-quote
+++ b/modules/sh-quote
@@ -17,6 +17,9 @@ lib_SOURCES += sh-quote.h sh-quote.c
 Include:
 "sh-quote.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/sh-quote-tests b/modules/sh-quote-tests
index ac6101a4c8..8252fee88d 100644
--- a/modules/sh-quote-tests
+++ b/modules/sh-quote-tests
@@ -8,4 +8,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-sh-quote
 check_PROGRAMS += test-sh-quote
-test_sh_quote_LDADD = $(LDADD) @LIBINTL@
+test_sh_quote_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
diff --git a/modules/system-quote b/modules/system-quote
index 14c0e29cdc..09503e53ce 100644
--- a/modules/system-quote
+++ b/modules/system-quote
@@ -17,6 +17,9 @@ lib_SOURCES += system-quote.h system-quote.c
 Include:
 "system-quote.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/system-quote-tests b/modules/system-quote-tests
index eb69bbd345..413453b081 100644
--- a/modules/system-quote-tests
+++ b/modules/system-quote-tests
@@ -18,7 +18,7 @@ configure.ac:
 Makefile.am:
 TESTS += test-system-quote.sh
 check_PROGRAMS += test-system-quote-main test-system-quote-child
-test_system_quote_main_LDADD = $(LDADD) @LIBINTL@
+test_system_quote_main_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)
 # The test-system-quote-child program must be a real executable, not a libtool
 # wrapper script, and should link against as few libraries as possible.
 # Therefore don't link it against any libraries other than -lc.
diff --git a/modules/trim b/modules/trim
index c954509aa3..13d3579a69 100644
--- a/modules/trim
+++ b/modules/trim
@@ -20,6 +20,9 @@ lib_SOURCES += trim.c
 Include:
 "trim.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/unistdio/ulc-asnprintf b/modules/unistdio/ulc-asnprintf
index 84772cc968..a0c1d1fbd0 100644
--- a/modules/unistdio/ulc-asnprintf
+++ b/modules/unistdio/ulc-asnprintf
@@ -21,6 +21,9 @@ endif
 Include:
 "unistdio.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv3+ or GPLv2
 
diff --git a/modules/unistdio/ulc-asnprintf-tests b/modules/unistdio/ulc-asnprintf-tests
index 9614b8bab9..276c7e5bff 100644
--- a/modules/unistdio/ulc-asnprintf-tests
+++ b/modules/unistdio/ulc-asnprintf-tests
@@ -12,4 +12,4 @@ Makefile.am:
 TESTS += test-ulc-asnprintf1
 check_PROGRAMS += test-ulc-asnprintf1
 test_ulc_asnprintf1_SOURCES = unistdio/test-ulc-asnprintf1.c
-test_ulc_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_ulc_asnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIBTHREAD)
diff --git a/modules/unistdio/ulc-fprintf b/modules/unistdio/ulc-fprintf
index ed4a70abfb..ad3d2d8394 100644
--- a/modules/unistdio/ulc-fprintf
+++ b/modules/unistdio/ulc-fprintf
@@ -21,6 +21,9 @@ endif
 Include:
 "unistdio.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv3+ or GPLv2
 
diff --git a/modules/unistdio/ulc-vasnprintf b/modules/unistdio/ulc-vasnprintf
index 2c2adb3f75..5febf32039 100644
--- a/modules/unistdio/ulc-vasnprintf
+++ b/modules/unistdio/ulc-vasnprintf
@@ -58,6 +58,9 @@ endif
 Include:
 "unistdio.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv3+ or GPLv2
 
diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests
index 20e2f71842..b72c1888a7 100644
--- a/modules/unistdio/ulc-vasnprintf-tests
+++ b/modules/unistdio/ulc-vasnprintf-tests
@@ -22,8 +22,8 @@ TESTS += test-ulc-vasnprintf1 unistdio/test-ulc-vasnprintf2.sh unistdio/test-ulc
 TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 check_PROGRAMS += test-ulc-vasnprintf1 test-ulc-vasnprintf2 test-ulc-vasnprintf3
 test_ulc_vasnprintf1_SOURCES = unistdio/test-ulc-vasnprintf1.c
-test_ulc_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_ulc_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIBTHREAD)
 test_ulc_vasnprintf2_SOURCES = unistdio/test-ulc-vasnprintf2.c
-test_ulc_vasnprintf2_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_ulc_vasnprintf2_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIBTHREAD)
 test_ulc_vasnprintf3_SOURCES = unistdio/test-ulc-vasnprintf3.c
-test_ulc_vasnprintf3_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_ulc_vasnprintf3_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIBTHREAD)
diff --git a/modules/unistdio/ulc-vasprintf b/modules/unistdio/ulc-vasprintf
index 6d678bdf3d..19965c1aab 100644
--- a/modules/unistdio/ulc-vasprintf
+++ b/modules/unistdio/ulc-vasprintf
@@ -21,6 +21,9 @@ endif
 Include:
 "unistdio.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv3+ or GPLv2
 
diff --git a/modules/unistdio/ulc-vasprintf-tests b/modules/unistdio/ulc-vasprintf-tests
index 27549d75ad..b034f3f65f 100644
--- a/modules/unistdio/ulc-vasprintf-tests
+++ b/modules/unistdio/ulc-vasprintf-tests
@@ -11,4 +11,4 @@ Makefile.am:
 TESTS += test-ulc-vasprintf1
 check_PROGRAMS += test-ulc-vasprintf1
 test_ulc_vasprintf1_SOURCES = unistdio/test-ulc-vasprintf1.c
-test_ulc_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
+test_ulc_vasprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ $(LIBTHREAD)
diff --git a/modules/unistdio/ulc-vfprintf b/modules/unistdio/ulc-vfprintf
index b7a7da7269..28d19ab457 100644
--- a/modules/unistdio/ulc-vfprintf
+++ b/modules/unistdio/ulc-vfprintf
@@ -21,6 +21,9 @@ endif
 Include:
 "unistdio.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv3+ or GPLv2
 
diff --git a/modules/unistdio/ulc-vsnprintf b/modules/unistdio/ulc-vsnprintf
index b390b9163d..c204b75625 100644
--- a/modules/unistdio/ulc-vsnprintf
+++ b/modules/unistdio/ulc-vsnprintf
@@ -21,6 +21,9 @@ endif
 Include:
 "unistdio.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv3+ or GPLv2
 
diff --git a/modules/unistdio/ulc-vsnprintf-tests b/modules/unistdio/ulc-vsnprintf-tests
index 112456bff8..029a825b78 100644
--- a/modules/unistdio/ulc-vsnprintf-tests
+++ b/modules/unistdio/ulc-vsnprintf-tests
@@ -12,4 +12,4 @@ Makefile.am:
 TESTS += test-ulc-vsnprintf1
 check_PROGRAMS += test-ulc-vsnprintf1
 test_ulc_vsnprintf1_SOURCES = unistdio/test-ulc-vsnprintf1.c
-test_ulc_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
+test_ulc_vsnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(LIBTHREAD)
diff --git a/modules/unistdio/ulc-vsprintf b/modules/unistdio/ulc-vsprintf
index 79a9bc57a0..b536826cd6 100644
--- a/modules/unistdio/ulc-vsprintf
+++ b/modules/unistdio/ulc-vsprintf
@@ -22,6 +22,9 @@ endif
 Include:
 "unistdio.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 LGPLv3+ or GPLv2
 
diff --git a/modules/unistdio/ulc-vsprintf-tests b/modules/unistdio/ulc-vsprintf-tests
index 147dc9b45a..32b1b5ce39 100644
--- a/modules/unistdio/ulc-vsprintf-tests
+++ b/modules/unistdio/ulc-vsprintf-tests
@@ -12,4 +12,4 @@ Makefile.am:
 TESTS += test-ulc-vsprintf1
 check_PROGRAMS += test-ulc-vsprintf1
 test_ulc_vsprintf1_SOURCES = unistdio/test-ulc-vsprintf1.c
-test_ulc_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@
+test_ulc_vsprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBINTL@ @LIBICONV@ $(LIBTHREAD)
diff --git a/modules/xfreopen b/modules/xfreopen
index 850446d7a6..63266db52c 100644
--- a/modules/xfreopen
+++ b/modules/xfreopen
@@ -19,6 +19,9 @@ lib_SOURCES += xfreopen.c xfreopen.h
 Include:
 "xfreopen.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/xmemcoll b/modules/xmemcoll
index 06d06a3207..4f13d85a43 100644
--- a/modules/xmemcoll
+++ b/modules/xmemcoll
@@ -20,6 +20,9 @@ lib_SOURCES += xmemcoll.h xmemcoll.c
 Include:
 "xmemcoll.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/yesno b/modules/yesno
index 5b5f4cd5fc..8ae50df322 100644
--- a/modules/yesno
+++ b/modules/yesno
@@ -21,6 +21,9 @@ lib_SOURCES += yesno.c
 Include:
 "yesno.h"
 
+Link:
+$(LIBTHREAD)
+
 License:
 GPL
 
diff --git a/modules/yesno-tests b/modules/yesno-tests
index 4582cef4ab..8836ee875a 100644
--- a/modules/yesno-tests
+++ b/modules/yesno-tests
@@ -12,4 +12,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-yesno.sh
 check_PROGRAMS += test-yesno
-test_yesno_LDADD = $(LDADD) @LIBINTL@
+test_yesno_LDADD = $(LDADD) @LIBINTL@ $(LIBTHREAD)