X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Funistdio%2Fu32-vasnprintf-tests;h=555319b4a128bc8236e15821db70535f4a80dd4d;hb=8b7bcee23747613b8b7a0aa0715dc4668fae68e0;hp=396d3c4ae40636f680dde2421ff1181cb21382d8;hpb=2625ca90abe3246f6d3240d59d32f1843afc9651;p=gnulib.git

diff --git a/modules/unistdio/u32-vasnprintf-tests b/modules/unistdio/u32-vasnprintf-tests
index 396d3c4ae..555319b4a 100644
--- a/modules/unistdio/u32-vasnprintf-tests
+++ b/modules/unistdio/u32-vasnprintf-tests
@@ -6,13 +6,16 @@ tests/unistdio/test-u32-vasnprintf2.sh
 tests/unistdio/test-u32-vasnprintf2.c
 tests/unistdio/test-u32-vasnprintf3.sh
 tests/unistdio/test-u32-vasnprintf3.c
+tests/macros.h
 m4/locale-fr.m4
+m4/codeset.m4
 
 Depends-on:
 unistr/u32-cmp
 unistr/u32-cpy
 unistr/u32-strcmp
 unistr/u32-strlen
+setlocale
 
 configure.ac:
 gt_LOCALE_FR
@@ -20,12 +23,11 @@ gt_LOCALE_FR_UTF8
 
 Makefile.am:
 TESTS += test-u32-vasnprintf1 unistdio/test-u32-vasnprintf2.sh unistdio/test-u32-vasnprintf3.sh
-TESTS_ENVIRONMENT += EXEEXT='@EXEEXT@' LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
+TESTS_ENVIRONMENT += LOCALE_FR='@LOCALE_FR@' LOCALE_FR_UTF8='@LOCALE_FR_UTF8@'
 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) @LIBICONV@
+test_u32_vasnprintf1_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_vasnprintf2_SOURCES = unistdio/test-u32-vasnprintf2.c
-test_u32_vasnprintf2_LDADD = $(LDADD) @LIBICONV@
+test_u32_vasnprintf2_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@
 test_u32_vasnprintf3_SOURCES = unistdio/test-u32-vasnprintf3.c
-test_u32_vasnprintf3_LDADD = $(LDADD) @LIBICONV@
-EXTRA_DIST += unistdio/test-u32-vasnprintf2.sh unistdio/test-u32-vasnprintf3.sh
+test_u32_vasnprintf3_LDADD = $(LDADD) $(LIBUNISTRING) @LIBICONV@