Rework LDADD. Have to distinguish two cases, whether @USE_INCLUDED_LIBINTL@

= yes or no.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 600023685f28618a207e12f89b6bcbcbf57b827c..56271dc2631e022784b281039691e268a389f0b3 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-10  Bruno Haible  <haible@clisp.cons.org>
+
+       * Makefile.am (LDADD): Define depending on @USE_INCLUDED_LIBINTL@.
+       (LDADD_yes, LDADD_no): New variables. When @USE_INCLUDED_LIBINTL@ = no,
+       use both ../intl/libgnuintl.a and @INTLLIBS@ instead of
+       ../intl/libintl.la. Needed on systems which have gettext() in
+       libintl.so, because: 1. getopt.c needs -lintl, 2. tstgettext.c needs
+       ../intl/libintl, 3. it is impossible to link with two different shared
+       libraries that have the same soname.
+
 2001-03-03  Bruno Haible  <haible@clisp.cons.org>
 
        * msgfmt-3: Filter out charset related warning from msgfmt.
@@ -11,11 +21,6 @@
        verifications.
        * gettext-1: Update.
 
-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 da579140595ea9af8f3850377e4762f7ee326e09..d402cc000ade0c70328afb09b3e4671f2abb78d9 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,7 +46,9 @@ 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 @LIBICONV@
+LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@)
+LDADD_yes = ../intl/libintl.la
+LDADD_no = ../intl/libgnuintl.la @INTLLIBS@
 EXTRA_PROGRAMS = tstgettext cake
 tstgettext_SOURCES = tstgettext.c setlocale.c
 tstgettext_LDADD = ../lib/libnlsut.a $(LDADD)