diff options
| author | Bruno Haible <bruno@clisp.org> | 2023-01-07 15:05:00 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2023-01-07 18:06:52 +0100 |
| commit | bd50da7f20cffb8c320f8592bd026b29ecc82a09 (patch) | |
| tree | 4e492d951b211f6274941fc7826ce5fd9227ae78 /modules | |
| parent | 283f413fb8789d2c9c89d41d912fc411c5ba9ab3 (diff) | |
| download | gnulib-bd50da7f20cffb8c320f8592bd026b29ecc82a09.tar.gz | |
setlocale: Rename LIB_SETLOCALE to SETLOCALE_LIB.
* m4/setlocale.m4: Rename LIB_SETLOCALE to SETLOCALE_LIB.
All uses changed.
* NEWS: Mention the change.
Diffstat (limited to 'modules')
78 files changed, 89 insertions, 89 deletions
diff --git a/modules/astrxfrm-tests b/modules/astrxfrm-tests index b113e34a31..f7cb9aa0c8 100644 --- a/modules/astrxfrm-tests +++ b/modules/astrxfrm-tests @@ -9,4 +9,4 @@ configure.ac: Makefile.am: TESTS += test-astrxfrm check_PROGRAMS += test-astrxfrm -test_astrxfrm_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_astrxfrm_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/btoc32-tests b/modules/btoc32-tests index 95900d59ba..b3373f3cf8 100644 --- a/modules/btoc32-tests +++ b/modules/btoc32-tests @@ -18,4 +18,4 @@ Makefile.am: TESTS += test-btoc32-1.sh test-btoc32-2.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-btoc32 -test_btoc32_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_btoc32_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/btowc-tests b/modules/btowc-tests index e36cc61c42..6bd3258520 100644 --- a/modules/btowc-tests +++ b/modules/btowc-tests @@ -18,4 +18,4 @@ Makefile.am: TESTS += test-btowc1.sh test-btowc2.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-btowc -test_btowc_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_btowc_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c-ctype-tests b/modules/c-ctype-tests index 02706b00de..0d8a8b63c5 100644 --- a/modules/c-ctype-tests +++ b/modules/c-ctype-tests @@ -11,4 +11,4 @@ configure.ac: Makefile.am: TESTS += test-c-ctype check_PROGRAMS += test-c-ctype -test_c_ctype_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c_ctype_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c-dtoastr-tests b/modules/c-dtoastr-tests index 687d7669bd..47658c038b 100644 --- a/modules/c-dtoastr-tests +++ b/modules/c-dtoastr-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-c-dtoastr.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' check_PROGRAMS += test-c-dtoastr -test_c_dtoastr_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c_dtoastr_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c-ldtoastr-tests b/modules/c-ldtoastr-tests index 2d4c7f81ea..1c2cfaecc0 100644 --- a/modules/c-ldtoastr-tests +++ b/modules/c-ldtoastr-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-c-ldtoastr.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' check_PROGRAMS += test-c-ldtoastr -test_c_ldtoastr_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c_ldtoastr_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c-snprintf-tests b/modules/c-snprintf-tests index 231a4fdb66..aeb2c3545c 100644 --- a/modules/c-snprintf-tests +++ b/modules/c-snprintf-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-c-snprintf.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' check_PROGRAMS += test-c-snprintf -test_c_snprintf_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c_snprintf_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c-strcase-tests b/modules/c-strcase-tests index 7cdb29cef2..23a3eb8aba 100644 --- a/modules/c-strcase-tests +++ b/modules/c-strcase-tests @@ -19,5 +19,5 @@ Makefile.am: TESTS += test-c-strcase.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' check_PROGRAMS += test-c-strcasecmp test-c-strncasecmp -test_c_strcasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) -test_c_strncasecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c_strcasecmp_LDADD = $(LDADD) $(SETLOCALE_LIB) +test_c_strncasecmp_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c-vasprintf-tests b/modules/c-vasprintf-tests index b82fc8b7e1..7becd9aa97 100644 --- a/modules/c-vasprintf-tests +++ b/modules/c-vasprintf-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-c-vasprintf.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' check_PROGRAMS += test-c-vasprintf -test_c_vasprintf_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c_vasprintf_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c-vsnprintf-tests b/modules/c-vsnprintf-tests index 542d8d98f3..0b90c6719f 100644 --- a/modules/c-vsnprintf-tests +++ b/modules/c-vsnprintf-tests @@ -15,4 +15,4 @@ Makefile.am: TESTS += test-c-vsnprintf.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' check_PROGRAMS += test-c-vsnprintf -test_c_vsnprintf_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c_vsnprintf_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c-xvasprintf-tests b/modules/c-xvasprintf-tests index 75ce919410..9d5414d74f 100644 --- a/modules/c-xvasprintf-tests +++ b/modules/c-xvasprintf-tests @@ -16,4 +16,4 @@ Makefile.am: TESTS += test-c-xvasprintf.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' check_PROGRAMS += test-c-xvasprintf -test_c_xvasprintf_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ +test_c_xvasprintf_LDADD = $(LDADD) $(SETLOCALE_LIB) @LIBINTL@ diff --git a/modules/c32isalnum-tests b/modules/c32isalnum-tests index a4fd812259..3c9036cb96 100644 --- a/modules/c32isalnum-tests +++ b/modules/c32isalnum-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isalnum -test_c32isalnum_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32isalnum_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isalpha-tests b/modules/c32isalpha-tests index d5864dac3c..f62f78c288 100644 --- a/modules/c32isalpha-tests +++ b/modules/c32isalpha-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isalpha -test_c32isalpha_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32isalpha_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isblank-tests b/modules/c32isblank-tests index 0e1a694548..9f19076407 100644 --- a/modules/c32isblank-tests +++ b/modules/c32isblank-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isblank -test_c32isblank_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32isblank_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32iscntrl-tests b/modules/c32iscntrl-tests index dcf26e0f89..097de3cf47 100644 --- a/modules/c32iscntrl-tests +++ b/modules/c32iscntrl-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32iscntrl -test_c32iscntrl_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32iscntrl_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isdigit-tests b/modules/c32isdigit-tests index db2e3d4752..fe83e357ed 100644 --- a/modules/c32isdigit-tests +++ b/modules/c32isdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isdigit -test_c32isdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32isdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isgraph-tests b/modules/c32isgraph-tests index 9efa4342c7..a6aac6e067 100644 --- a/modules/c32isgraph-tests +++ b/modules/c32isgraph-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isgraph -test_c32isgraph_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32isgraph_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32islower-tests b/modules/c32islower-tests index b8d8fa4ab3..a502e28eb1 100644 --- a/modules/c32islower-tests +++ b/modules/c32islower-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32islower -test_c32islower_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32islower_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isprint-tests b/modules/c32isprint-tests index 17fb0b6fe5..0c13d467b4 100644 --- a/modules/c32isprint-tests +++ b/modules/c32isprint-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isprint -test_c32isprint_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32isprint_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32ispunct-tests b/modules/c32ispunct-tests index 8ab1c6fa52..7475e3bd76 100644 --- a/modules/c32ispunct-tests +++ b/modules/c32ispunct-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32ispunct -test_c32ispunct_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32ispunct_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isspace-tests b/modules/c32isspace-tests index a648014e3a..51988a7a48 100644 --- a/modules/c32isspace-tests +++ b/modules/c32isspace-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isspace -test_c32isspace_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32isspace_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isupper-tests b/modules/c32isupper-tests index 1d42997719..db5783c181 100644 --- a/modules/c32isupper-tests +++ b/modules/c32isupper-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isupper -test_c32isupper_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32isupper_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32isxdigit-tests b/modules/c32isxdigit-tests index 9731b9593c..3c986916b7 100644 --- a/modules/c32isxdigit-tests +++ b/modules/c32isxdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32isxdigit -test_c32isxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) $(LIBUNISTRING) +test_c32isxdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) $(LIBUNISTRING) diff --git a/modules/c32rtomb-tests b/modules/c32rtomb-tests index a8d2bee3fe..f1f83ae45c 100644 --- a/modules/c32rtomb-tests +++ b/modules/c32rtomb-tests @@ -40,4 +40,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32rtomb test-c32rtomb-w32 -test_c32rtomb_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c32rtomb_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c32snrtombs-tests b/modules/c32snrtombs-tests index 038d334ec3..d6e578d07d 100644 --- a/modules/c32snrtombs-tests +++ b/modules/c32snrtombs-tests @@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32snrtombs -test_c32snrtombs_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c32snrtombs_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c32srtombs-tests b/modules/c32srtombs-tests index 2501ba3726..bb12d4140b 100644 --- a/modules/c32srtombs-tests +++ b/modules/c32srtombs-tests @@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32srtombs -test_c32srtombs_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c32srtombs_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/c32stombs-tests b/modules/c32stombs-tests index c96de03299..92389ba29e 100644 --- a/modules/c32stombs-tests +++ b/modules/c32stombs-tests @@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-c32stombs -test_c32stombs_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_c32stombs_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/dfa-tests b/modules/dfa-tests index 7d8f05a271..afa317acdf 100644 --- a/modules/dfa-tests +++ b/modules/dfa-tests @@ -19,4 +19,4 @@ TESTS += \ test-dfa-match.sh check_PROGRAMS += test-dfa-match-aux -test_dfa_match_aux_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(MBRTOWC_LIB) +test_dfa_match_aux_LDADD = $(LDADD) $(SETLOCALE_LIB) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/duplocale-tests b/modules/duplocale-tests index 55ec1f279e..01df43bf84 100644 --- a/modules/duplocale-tests +++ b/modules/duplocale-tests @@ -15,4 +15,4 @@ gt_FUNC_USELOCALE Makefile.am: TESTS += test-duplocale check_PROGRAMS += test-duplocale -test_duplocale_LDADD = $(LDADD) $(LIB_SETLOCALE) @DUPLOCALE_LIB@ +test_duplocale_LDADD = $(LDADD) $(SETLOCALE_LIB) @DUPLOCALE_LIB@ diff --git a/modules/hard-locale-tests b/modules/hard-locale-tests index 90677d996f..b37fc39289 100644 --- a/modules/hard-locale-tests +++ b/modules/hard-locale-tests @@ -13,7 +13,7 @@ AC_CHECK_FUNCS_ONCE([duplocale]) Makefile.am: TESTS += test-hard-locale check_PROGRAMS += test-hard-locale -test_hard_locale_LDADD = $(LDADD) $(LIB_SETLOCALE) @HARD_LOCALE_LIB@ +test_hard_locale_LDADD = $(LDADD) $(SETLOCALE_LIB) @HARD_LOCALE_LIB@ # We cannot call this program 'locale', because the C++ compiler on Mac OS X # would then barf upon '#include <locale>'. So, call it 'current-locale'. noinst_PROGRAMS += current-locale diff --git a/modules/iswdigit-tests b/modules/iswdigit-tests index e524b1bc6d..c224ca6516 100644 --- a/modules/iswdigit-tests +++ b/modules/iswdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-iswdigit -test_iswdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_iswdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/iswxdigit-tests b/modules/iswxdigit-tests index 2897e7da3f..c2f9f652a8 100644 --- a/modules/iswxdigit-tests +++ b/modules/iswxdigit-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-iswxdigit -test_iswxdigit_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_iswxdigit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/localcharset-tests b/modules/localcharset-tests index 70d5cfd551..cb84f2cdc7 100644 --- a/modules/localcharset-tests +++ b/modules/localcharset-tests @@ -7,4 +7,4 @@ configure.ac: Makefile.am: noinst_PROGRAMS += test-localcharset -test_localcharset_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_localcharset_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/locale-c++-tests b/modules/locale-c++-tests index 1b6b7d9250..8346327d86 100644 --- a/modules/locale-c++-tests +++ b/modules/locale-c++-tests @@ -16,5 +16,5 @@ if ANSICXX TESTS += test-locale-c++ check_PROGRAMS += test-locale-c++ test_locale_c___SOURCES = test-locale-c++.cc test-locale-c++2.cc -test_locale_c___LDADD = $(LDADD) $(LIB_SETLOCALE) +test_locale_c___LDADD = $(LDADD) $(SETLOCALE_LIB) endif diff --git a/modules/localename-tests b/modules/localename-tests index 4b9a28a65c..af9ee464da 100644 --- a/modules/localename-tests +++ b/modules/localename-tests @@ -15,5 +15,5 @@ AC_CHECK_FUNCS_ONCE([newlocale]) Makefile.am: TESTS += test-localename check_PROGRAMS += test-localename -test_localename_LDADD = $(LDADD) $(LIB_SETLOCALE) @INTL_MACOSX_LIBS@ $(LIBTHREAD) +test_localename_LDADD = $(LDADD) $(SETLOCALE_LIB) @INTL_MACOSX_LIBS@ $(LIBTHREAD) diff --git a/modules/mbmemcasecmp-tests b/modules/mbmemcasecmp-tests index bf522e8472..bb2c4e6231 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) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbmemcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbmemcasecoll-tests b/modules/mbmemcasecoll-tests index 0fe4d9c725..8fa2805872 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) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbmemcasecoll_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbrtoc32-tests b/modules/mbrtoc32-tests index 9cb1f96ae8..e123772a20 100644 --- a/modules/mbrtoc32-tests +++ b/modules/mbrtoc32-tests @@ -45,4 +45,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbrtoc32 test-mbrtoc32-w32 -test_mbrtoc32_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbrtoc32_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbrtowc-tests b/modules/mbrtowc-tests index 3362aa0d91..801425ad24 100644 --- a/modules/mbrtowc-tests +++ b/modules/mbrtowc-tests @@ -45,4 +45,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbrtowc test-mbrtowc-w32 -test_mbrtowc_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbrtowc_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbscasecmp-tests b/modules/mbscasecmp-tests index a777571945..cd974fab20 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) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbscasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbscasestr-tests b/modules/mbscasestr-tests index 09ebcaee77..40f0944dba 100644 --- a/modules/mbscasestr-tests +++ b/modules/mbscasestr-tests @@ -25,6 +25,6 @@ TESTS += test-mbscasestr1 test-mbscasestr2.sh test-mbscasestr3.sh test-mbscasest 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) $(LIBUNISTRING) $(MBRTOWC_LIB) -test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) -test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) -test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbscasestr2_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) +test_mbscasestr3_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) +test_mbscasestr4_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbschr-tests b/modules/mbschr-tests index 0d6b44f8ac..5ba4550d70 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) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbschr_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbscspn-tests b/modules/mbscspn-tests index 054fc61cbc..3763e1ce3e 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) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbscspn_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbsinit-tests b/modules/mbsinit-tests index 040ce4e588..15f21581c7 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) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsinit_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbsncasecmp-tests b/modules/mbsncasecmp-tests index c981e97c39..079fedb691 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) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsncasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbsnrtoc32s-tests b/modules/mbsnrtoc32s-tests index a06d51c3f7..449c277aa0 100644 --- a/modules/mbsnrtoc32s-tests +++ b/modules/mbsnrtoc32s-tests @@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsnrtoc32s -test_mbsnrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsnrtoc32s_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbsnrtowcs-tests b/modules/mbsnrtowcs-tests index 9dade91a2a..c7c528448f 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) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsnrtowcs_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbspbrk-tests b/modules/mbspbrk-tests index 52f56d931e..7fa86d9a9b 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) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbspbrk_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbspcasecmp-tests b/modules/mbspcasecmp-tests index d64055eb9f..a7d5ad6aef 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) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbspcasecmp_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbsrchr-tests b/modules/mbsrchr-tests index cba16a3501..18589a3be6 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) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsrchr_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbsrtoc32s-tests b/modules/mbsrtoc32s-tests index 64eb047f4c..f794c5ae32 100644 --- a/modules/mbsrtoc32s-tests +++ b/modules/mbsrtoc32s-tests @@ -31,4 +31,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbsrtoc32s -test_mbsrtoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsrtoc32s_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbsrtowcs-tests b/modules/mbsrtowcs-tests index b8137484b5..d7301057d9 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) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsrtowcs_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbsspn-tests b/modules/mbsspn-tests index 12434a3256..d2cc24c206 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) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsspn_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbsstr-tests b/modules/mbsstr-tests index 832c09c115..826ad32f83 100644 --- a/modules/mbsstr-tests +++ b/modules/mbsstr-tests @@ -21,5 +21,5 @@ 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) $(LIBUNISTRING) $(MBRTOWC_LIB) -test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) -test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbsstr2_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) +test_mbsstr3_LDADD = $(LDADD) $(LIBUNISTRING) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/mbstoc32s-tests b/modules/mbstoc32s-tests index 5ddb287328..565796a06f 100644 --- a/modules/mbstoc32s-tests +++ b/modules/mbstoc32s-tests @@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-mbstoc32s -test_mbstoc32s_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) +test_mbstoc32s_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) diff --git a/modules/nl_langinfo-tests b/modules/nl_langinfo-tests index 811112ff0f..c6770ec321 100644 --- a/modules/nl_langinfo-tests +++ b/modules/nl_langinfo-tests @@ -20,5 +20,5 @@ Makefile.am: TESTS += test-nl_langinfo.sh test-nl_langinfo-mt TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-nl_langinfo test-nl_langinfo-mt -test_nl_langinfo_LDADD = $(LDADD) $(LIB_SETLOCALE) -test_nl_langinfo_mt_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBMULTITHREAD) $(NANOSLEEP_LIB) +test_nl_langinfo_LDADD = $(LDADD) $(SETLOCALE_LIB) +test_nl_langinfo_mt_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBMULTITHREAD) $(NANOSLEEP_LIB) diff --git a/modules/quotearg-tests b/modules/quotearg-tests index 176b317785..0ff8b4d402 100644 --- a/modules/quotearg-tests +++ b/modules/quotearg-tests @@ -29,4 +29,4 @@ TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' \ host_os='@host_os@' check_PROGRAMS += test-quotearg -test_quotearg_LDADD = $(LDADD) $(LIB_SETLOCALE) @LIBINTL@ $(MBRTOWC_LIB) +test_quotearg_LDADD = $(LDADD) $(SETLOCALE_LIB) @LIBINTL@ $(MBRTOWC_LIB) diff --git a/modules/regex-tests b/modules/regex-tests index 6475707509..b6946c1417 100644 --- a/modules/regex-tests +++ b/modules/regex-tests @@ -12,4 +12,4 @@ configure.ac: Makefile.am: TESTS += test-regex check_PROGRAMS += test-regex -test_regex_LDADD = $(LDADD) $(LIB_SETLOCALE) $(MBRTOWC_LIB) @LIBINTL@ $(LIBTHREAD) +test_regex_LDADD = $(LDADD) $(SETLOCALE_LIB) $(MBRTOWC_LIB) @LIBINTL@ $(LIBTHREAD) diff --git a/modules/setlocale b/modules/setlocale index 552c978baa..0b2c8e0486 100644 --- a/modules/setlocale +++ b/modules/setlocale @@ -27,7 +27,7 @@ Include: <locale.h> Link: -$(LIB_SETLOCALE) +$(SETLOCALE_LIB) License: LGPL diff --git a/modules/setlocale-tests b/modules/setlocale-tests index 25129f92ef..78060d1ccc 100644 --- a/modules/setlocale-tests +++ b/modules/setlocale-tests @@ -27,5 +27,5 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-setlocale1 test-setlocale2 -test_setlocale1_LDADD = $(LDADD) @LIB_SETLOCALE@ -test_setlocale2_LDADD = $(LDADD) @LIB_SETLOCALE@ +test_setlocale1_LDADD = $(LDADD) @SETLOCALE_LIB@ +test_setlocale2_LDADD = $(LDADD) @SETLOCALE_LIB@ diff --git a/modules/strfmon_l-tests b/modules/strfmon_l-tests index cf2d6a2fa3..397a035858 100644 --- a/modules/strfmon_l-tests +++ b/modules/strfmon_l-tests @@ -10,4 +10,4 @@ configure.ac: Makefile.am: TESTS += test-strfmon_l check_PROGRAMS += test-strfmon_l -test_strfmon_l_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_strfmon_l_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/strtod-tests b/modules/strtod-tests index 03966580f9..c654264c3d 100644 --- a/modules/strtod-tests +++ b/modules/strtod-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-strtod1 -test_strtod1_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_strtod1_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/strtold-tests b/modules/strtold-tests index dc82f50a08..0d35390877 100644 --- a/modules/strtold-tests +++ b/modules/strtold-tests @@ -26,4 +26,4 @@ TESTS_ENVIRONMENT += \ LOCALE_FR='@LOCALE_FR@' \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-strtold1 -test_strtold1_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_strtold1_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/unicase/locale-language-tests b/modules/unicase/locale-language-tests index 1399e52692..1407383da0 100644 --- a/modules/unicase/locale-language-tests +++ b/modules/unicase/locale-language-tests @@ -23,4 +23,4 @@ TESTS += unicase/test-locale-language.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' LOCALE_JA='@LOCALE_JA@' LOCALE_TR_UTF8='@LOCALE_TR_UTF8@' LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-locale-language test_locale_language_SOURCES = unicase/test-locale-language.c -test_locale_language_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @INTL_MACOSX_LIBS@ $(LIBTHREAD) +test_locale_language_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @INTL_MACOSX_LIBS@ $(LIBTHREAD) diff --git a/modules/unicase/ulc-casecmp-tests b/modules/unicase/ulc-casecmp-tests index 08a8620d5f..f62f45de4d 100644 --- a/modules/unicase/ulc-casecmp-tests +++ b/modules/unicase/ulc-casecmp-tests @@ -22,5 +22,5 @@ TESTS_ENVIRONMENT += \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-ulc-casecmp test_ulc_casecmp_SOURCES = unicase/test-ulc-casecmp.c -test_ulc_casecmp_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_ulc_casecmp_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ diff --git a/modules/unicase/ulc-casecoll-tests b/modules/unicase/ulc-casecoll-tests index 1610872651..0aff32f725 100644 --- a/modules/unicase/ulc-casecoll-tests +++ b/modules/unicase/ulc-casecoll-tests @@ -22,5 +22,5 @@ TESTS_ENVIRONMENT += \ LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-ulc-casecoll test_ulc_casecoll_SOURCES = unicase/test-ulc-casecoll.c -test_ulc_casecoll_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_ulc_casecoll_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ diff --git a/modules/unicodeio-tests b/modules/unicodeio-tests index c53f26f2b5..05fcdeb0ba 100644 --- a/modules/unicodeio-tests +++ b/modules/unicodeio-tests @@ -18,4 +18,4 @@ gt_LOCALE_ZH_CN Makefile.am: TESTS += test-unicodeio1.sh test-unicodeio2.sh test-unicodeio3.sh check_PROGRAMS += test-unicodeio -test_unicodeio_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) $(LIBICONV) $(LIBINTL) +test_unicodeio_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) $(LIBICONV) $(LIBINTL) diff --git a/modules/unigbrk/ulc-grapheme-breaks-tests b/modules/unigbrk/ulc-grapheme-breaks-tests index a6dacd0001..341e308a5c 100644 --- a/modules/unigbrk/ulc-grapheme-breaks-tests +++ b/modules/unigbrk/ulc-grapheme-breaks-tests @@ -16,4 +16,4 @@ TESTS += unigbrk/test-ulc-grapheme-breaks.sh TESTS_ENVIRONMENT += LOCALE_AR='@LOCALE_AR@' check_PROGRAMS += test-ulc-grapheme-breaks test_ulc_grapheme_breaks_SOURCES = unigbrk/test-ulc-grapheme-breaks.c -test_ulc_grapheme_breaks_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_ulc_grapheme_breaks_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ diff --git a/modules/unistdio/u16-vasnprintf-tests b/modules/unistdio/u16-vasnprintf-tests index 45e3ab2200..6daf878bec 100644 --- a/modules/unistdio/u16-vasnprintf-tests +++ b/modules/unistdio/u16-vasnprintf-tests @@ -28,6 +28,6 @@ check_PROGRAMS += test-u16-vasnprintf1 test-u16-vasnprintf2 test-u16-vasnprintf3 test_u16_vasnprintf1_SOURCES = unistdio/test-u16-vasnprintf1.c test_u16_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ test_u16_vasnprintf2_SOURCES = unistdio/test-u16-vasnprintf2.c -test_u16_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_u16_vasnprintf2_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ test_u16_vasnprintf3_SOURCES = unistdio/test-u16-vasnprintf3.c -test_u16_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_u16_vasnprintf3_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ diff --git a/modules/unistdio/u32-vasnprintf-tests b/modules/unistdio/u32-vasnprintf-tests index 7343c328e6..a5d4b08925 100644 --- a/modules/unistdio/u32-vasnprintf-tests +++ b/modules/unistdio/u32-vasnprintf-tests @@ -28,6 +28,6 @@ check_PROGRAMS += test-u32-vasnprintf1 test-u32-vasnprintf2 test-u32-vasnprintf3 test_u32_vasnprintf1_SOURCES = unistdio/test-u32-vasnprintf1.c test_u32_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ test_u32_vasnprintf2_SOURCES = unistdio/test-u32-vasnprintf2.c -test_u32_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_u32_vasnprintf2_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ test_u32_vasnprintf3_SOURCES = unistdio/test-u32-vasnprintf3.c -test_u32_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_u32_vasnprintf3_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ diff --git a/modules/unistdio/u8-vasnprintf-tests b/modules/unistdio/u8-vasnprintf-tests index 70c9820326..219cb4b590 100644 --- a/modules/unistdio/u8-vasnprintf-tests +++ b/modules/unistdio/u8-vasnprintf-tests @@ -28,6 +28,6 @@ check_PROGRAMS += test-u8-vasnprintf1 test-u8-vasnprintf2 test-u8-vasnprintf3 test_u8_vasnprintf1_SOURCES = unistdio/test-u8-vasnprintf1.c test_u8_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@ test_u8_vasnprintf2_SOURCES = unistdio/test-u8-vasnprintf2.c -test_u8_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_u8_vasnprintf2_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ test_u8_vasnprintf3_SOURCES = unistdio/test-u8-vasnprintf3.c -test_u8_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_u8_vasnprintf3_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ diff --git a/modules/unistdio/ulc-vasnprintf-tests b/modules/unistdio/ulc-vasnprintf-tests index 6a5155dcf4..2930ee7edd 100644 --- a/modules/unistdio/ulc-vasnprintf-tests +++ b/modules/unistdio/ulc-vasnprintf-tests @@ -24,6 +24,6 @@ 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@ $(MBRTOWC_LIB) test_ulc_vasnprintf2_SOURCES = unistdio/test-ulc-vasnprintf2.c -test_ulc_vasnprintf2_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB) +test_ulc_vasnprintf2_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB) test_ulc_vasnprintf3_SOURCES = unistdio/test-ulc-vasnprintf3.c -test_ulc_vasnprintf3_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB) +test_ulc_vasnprintf3_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ $(MBRTOWC_LIB) diff --git a/modules/uniwbrk/ulc-wordbreaks-tests b/modules/uniwbrk/ulc-wordbreaks-tests index cfb866b503..e2e2e056ee 100644 --- a/modules/uniwbrk/ulc-wordbreaks-tests +++ b/modules/uniwbrk/ulc-wordbreaks-tests @@ -16,5 +16,5 @@ TESTS += uniwbrk/test-ulc-wordbreaks.sh TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' check_PROGRAMS += test-ulc-wordbreaks test_ulc_wordbreaks_SOURCES = uniwbrk/test-ulc-wordbreaks.c -test_ulc_wordbreaks_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) @LIBICONV@ +test_ulc_wordbreaks_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) @LIBICONV@ diff --git a/modules/vasnprintf-posix-tests b/modules/vasnprintf-posix-tests index 2ea2791ddf..2ff8fc1da3 100644 --- a/modules/vasnprintf-posix-tests +++ b/modules/vasnprintf-posix-tests @@ -24,5 +24,5 @@ Makefile.am: TESTS += test-vasnprintf-posix test-vasnprintf-posix2.sh test-vasnprintf-posix3 TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@' check_PROGRAMS += test-vasnprintf-posix test-vasnprintf-posix2 test-vasnprintf-posix3 -test_vasnprintf_posix2_LDADD = $(LDADD) $(LIB_SETLOCALE) -test_vasnprintf_posix3_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_vasnprintf_posix2_LDADD = $(LDADD) $(SETLOCALE_LIB) +test_vasnprintf_posix3_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/wcrtomb-tests b/modules/wcrtomb-tests index 18ff62c227..56ab65d09a 100644 --- a/modules/wcrtomb-tests +++ b/modules/wcrtomb-tests @@ -39,4 +39,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-wcrtomb test-wcrtomb-w32 -test_wcrtomb_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_wcrtomb_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/wcsnrtombs-tests b/modules/wcsnrtombs-tests index adeda4e9d1..6ddd43a27e 100644 --- a/modules/wcsnrtombs-tests +++ b/modules/wcsnrtombs-tests @@ -28,4 +28,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-wcsnrtombs -test_wcsnrtombs_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_wcsnrtombs_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/wcsrtombs-tests b/modules/wcsrtombs-tests index 2f52f68b20..09b12d7ef3 100644 --- a/modules/wcsrtombs-tests +++ b/modules/wcsrtombs-tests @@ -28,4 +28,4 @@ TESTS_ENVIRONMENT += \ LOCALE_JA='@LOCALE_JA@' \ LOCALE_ZH_CN='@LOCALE_ZH_CN@' check_PROGRAMS += test-wcsrtombs -test_wcsrtombs_LDADD = $(LDADD) $(LIB_SETLOCALE) +test_wcsrtombs_LDADD = $(LDADD) $(SETLOCALE_LIB) diff --git a/modules/wcwidth-tests b/modules/wcwidth-tests index 875d18f8d3..07627def04 100644 --- a/modules/wcwidth-tests +++ b/modules/wcwidth-tests @@ -12,4 +12,4 @@ configure.ac: Makefile.am: TESTS += test-wcwidth check_PROGRAMS += test-wcwidth -test_wcwidth_LDADD = $(LDADD) $(LIB_SETLOCALE) $(LIBUNISTRING) +test_wcwidth_LDADD = $(LDADD) $(SETLOCALE_LIB) $(LIBUNISTRING) |