test-u..-vs(n?)printf1 need LIBINTL (and?) LIBICONV

[Ralf Wildenhues]

On FreeBSD 6.2 I get this kind of error for the test-u*-vs(|n)printf1
tests:  (beware, creative mixing of regex and glob syntax above ;-)

gcc -std=gnu99  -g -O2  -Wl,--as-needed -o test-u16-vsprintf1 
test-u16-vsprintf1.o ../gllib/libgnu.a /usr/local/lib/libiconv.so -Wl,-rpath 
-Wl,/usr/local/lib -lm
../gllib/libgnu.a(xalloc-die.o)(.text+0xc): In function `xalloc_die':
../../dummy-0/gllib/xalloc-die.c:34: undefined reference to `libintl_gettext'
../gllib/libgnu.a(error.o)(.text+0x89): In function `error_tail':
../../dummy-0/gllib/error.c:125: undefined reference to `libintl_gettext'
gmake[4]: *** [test-u16-vsprintf1] Error 1

So I figured they need @LIBINTL@ instead of @address@hidden  So I applied the
patch below to my sources.  However, with the patch, on AIX 4.3.3 I get:

        cc -qlanglvl=extc89 -qlanglvl=extc89  -g   -o test-ulc-vsnprintf1 
test-ulc-vsnprintf1.o ../gllib/libgnu.a  -lm
ld: 0711-317 ERROR: Undefined symbol: .iconv
ld: 0711-317 ERROR: Undefined symbol: .iconv_open
ld: 0711-317 ERROR: Undefined symbol: .iconv_close
ld: 0711-345 Use the -bloadmap or -bnoquiet option to obtain more information.
make: 1254-004 The error code from the last command is 8.

Similar errors like the second one with some more tests.

Now, I can only guess that somewhere in gettext.m4 lies the answer to
this.  Or would these tests need both @LIBINTL@ and @address@hidden

Thanks,
Ralf

2007-10-22  Ralf Wildenhues  <address@hidden>

        * modules/unistdio/u16-vsnprintf-tests: Add @LIBINTL@, not
        @address@hidden
        * modules/unistdio/u16-vsprintf-tests: Likewise.
        * modules/unistdio/u32-vsnprintf-tests: Likewise.
        * modules/unistdio/u32-vsprintf-tests: Likewise.
        * modules/unistdio/u8-vsnprintf-tests: Likewise.
        * modules/unistdio/u8-vsprintf-tests: Likewise.
        * modules/unistdio/ulc-vsnprintf-tests: Likewise.
        * modules/unistdio/ulc-vsprintf-tests: Likewise.

diff --git a/modules/unistdio/u16-vsnprintf-tests 
b/modules/unistdio/u16-vsnprintf-tests
index 9a84acc..caa7988 100644
--- a/modules/unistdio/u16-vsnprintf-tests
+++ b/modules/unistdio/u16-vsnprintf-tests
@@ -11,4 +11,4 @@ Makefile.am:
 TESTS += test-u16-vsnprintf1
 check_PROGRAMS += test-u16-vsnprintf1
 test_u16_vsnprintf1_SOURCES = unistdio/test-u16-vsnprintf1.c
-test_u16_vsnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u16_vsnprintf1_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/unistdio/u16-vsprintf-tests 
b/modules/unistdio/u16-vsprintf-tests
index 49ad38b..61357c3 100644
--- a/modules/unistdio/u16-vsprintf-tests
+++ b/modules/unistdio/u16-vsprintf-tests
@@ -11,4 +11,4 @@ Makefile.am:
 TESTS += test-u16-vsprintf1
 check_PROGRAMS += test-u16-vsprintf1
 test_u16_vsprintf1_SOURCES = unistdio/test-u16-vsprintf1.c
-test_u16_vsprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u16_vsprintf1_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/unistdio/u32-vsnprintf-tests 
b/modules/unistdio/u32-vsnprintf-tests
index e183f75..e359321 100644
--- a/modules/unistdio/u32-vsnprintf-tests
+++ b/modules/unistdio/u32-vsnprintf-tests
@@ -11,4 +11,4 @@ Makefile.am:
 TESTS += test-u32-vsnprintf1
 check_PROGRAMS += test-u32-vsnprintf1
 test_u32_vsnprintf1_SOURCES = unistdio/test-u32-vsnprintf1.c
-test_u32_vsnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u32_vsnprintf1_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/unistdio/u32-vsprintf-tests 
b/modules/unistdio/u32-vsprintf-tests
index af1941e..45f4866 100644
--- a/modules/unistdio/u32-vsprintf-tests
+++ b/modules/unistdio/u32-vsprintf-tests
@@ -11,4 +11,4 @@ Makefile.am:
 TESTS += test-u32-vsprintf1
 check_PROGRAMS += test-u32-vsprintf1
 test_u32_vsprintf1_SOURCES = unistdio/test-u32-vsprintf1.c
-test_u32_vsprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u32_vsprintf1_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/unistdio/u8-vsnprintf-tests 
b/modules/unistdio/u8-vsnprintf-tests
index b8c7c0b..5fee320 100644
--- a/modules/unistdio/u8-vsnprintf-tests
+++ b/modules/unistdio/u8-vsnprintf-tests
@@ -11,4 +11,4 @@ Makefile.am:
 TESTS += test-u8-vsnprintf1
 check_PROGRAMS += test-u8-vsnprintf1
 test_u8_vsnprintf1_SOURCES = unistdio/test-u8-vsnprintf1.c
-test_u8_vsnprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u8_vsnprintf1_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/unistdio/u8-vsprintf-tests 
b/modules/unistdio/u8-vsprintf-tests
index 28794c2..7bf8ca5 100644
--- a/modules/unistdio/u8-vsprintf-tests
+++ b/modules/unistdio/u8-vsprintf-tests
@@ -11,4 +11,4 @@ Makefile.am:
 TESTS += test-u8-vsprintf1
 check_PROGRAMS += test-u8-vsprintf1
 test_u8_vsprintf1_SOURCES = unistdio/test-u8-vsprintf1.c
-test_u8_vsprintf1_LDADD = $(LDADD) @LIBICONV@
+test_u8_vsprintf1_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/unistdio/ulc-vsnprintf-tests 
b/modules/unistdio/ulc-vsnprintf-tests
index e609035..bf57f5c 100644
--- a/modules/unistdio/ulc-vsnprintf-tests
+++ b/modules/unistdio/ulc-vsnprintf-tests
@@ -11,4 +11,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) @LIBICONV@
+test_ulc_vsnprintf1_LDADD = $(LDADD) @LIBINTL@
diff --git a/modules/unistdio/ulc-vsprintf-tests 
b/modules/unistdio/ulc-vsprintf-tests
index 123d1df..ba28b01 100644
--- a/modules/unistdio/ulc-vsprintf-tests
+++ b/modules/unistdio/ulc-vsprintf-tests
@@ -11,4 +11,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) @LIBICONV@
+test_ulc_vsprintf1_LDADD = $(LDADD) @LIBINTL@