From: Bruno Haible Date: Tue, 8 Feb 2005 11:30:33 +0000 (+0000) Subject: Fix link error on MacOS X. X-Git-Tag: v0.14.2~78 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fd3d22624917dd1f1e2543e561bfd278dc46f44;p=thirdparty%2Fgettext.git Fix link error on MacOS X. --- diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index ba17cfb7f..6b101c517 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,9 @@ +2005-02-08 Bruno Haible + + * Makefile.am (LDADD_yes): Remove INTL_MACOSX_LIBS. + (LDADD): Add INTL_MACOSX_LIBS here. + Needed for MacOS X build with --disable-shared --disable-nls. + 2005-02-06 Bruno Haible * msgcat-11: New file. diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am index c75266062..80d79b44b 100644 --- a/gettext-tools/tests/Makefile.am +++ b/gettext-tools/tests/Makefile.am @@ -167,8 +167,8 @@ AM_CPPFLAGS = \ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ # INTL_MACOSX_LIBS is needed because the programs depend on libintl.la # but libtool doesn't put -Wl,-framework options into .la files. -LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) -LDADD_yes = ../intl/libintl.la @INTL_MACOSX_LIBS@ +LDADD = $(LDADD_@USE_INCLUDED_LIBINTL@) @INTL_MACOSX_LIBS@ +LDADD_yes = ../intl/libintl.la LDADD_no = ../intl/libgnuintl.la @LTLIBINTL@ noinst_PROGRAMS = tstgettext tstngettext testlocale cake fc3 fc4 fc5 tstgettext_SOURCES = tstgettext.c setlocale.c