Add -liconv where needed on platforms which have iconv() outside libc.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 19d470537067d3033a421d134372405b3bd81165..2f52ef68dbb4ef2fb162e2b78fc0278fb4c6d078 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-03  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettext.m4 (AM_WITH_NLS): Add $LIBICONV to $INTLLIBS.
+
 2001-02-07  Pavel Roskin  <proski@gnu.org>
 
        * c-bs-a.m4: Quote first argument of AC_DEFUN.

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 73c432e6dbe6b5884d12bd3a3e600b120d915932..ab3f0fe0b4d9bb2c10cb0fd3536a6af9ee4a01ef 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -129,6 +129,12 @@ return (int) gettext ("") + _nl_msg_cat_cntr],
        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
+      dnl If iconv() is in a separate libiconv library, then anyone linking
+      dnl with libintl{.a,.so} also needs to link with libiconv.
+      if test -n "$LIBICONV" && test -n "$INTLLIBS"; then
+        INTLLIBS="$INTLLIBS $LIBICONV"
+      fi
+
       dnl Test whether we really found GNU xgettext.
       if test "$XGETTEXT" != ":"; then
        dnl If it is no GNU xgettext we define it as : so that the

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 570316fe706889a490d080d53ccdb43944d2a7eb..b618b988f58ceaf53ff1d2a6662ba1ad17cff7ae 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-03  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.am (LDADD): Add @LIBICONV@. Needed on platforms where
+       iconv() is not in libc.
+
 2001-01-21  Bruno Haible  <haible@clisp.cons.org>
 
        Use libtool.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b01247ef5b561381567a686ea52c53dd7842ad35..da579140595ea9af8f3850377e4762f7ee326e09 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,7 +46,7 @@ xg-test1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c \
 # Two auxiliary programs used by the tests.
 INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
-LDADD = ../intl/libintl.la
+LDADD = ../intl/libintl.la @LIBICONV@
 EXTRA_PROGRAMS = tstgettext cake
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_LDADD = ../lib/libnlsut.a $(LDADD)