From: Bruno Haible Date: Sat, 4 Jun 2011 14:02:28 +0000 (+0200) Subject: Avoid link error when linking statically on AIX 7. X-Git-Tag: v0.18.2~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f50aada29808c6c4f5d39fa151f5eaf632f509e;p=thirdparty%2Fgettext.git Avoid link error when linking statically on AIX 7. --- diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog index 79da9f09d..e02c44fa3 100644 --- a/gettext-tools/src/ChangeLog +++ b/gettext-tools/src/ChangeLog @@ -1,3 +1,8 @@ +2011-06-04 Bruno Haible + + Avoid link error when linking statically on AIX 7. + * Makefile.am (xgettext_LDADD): Add LTLIBICONV. + 2011-04-13 Bruno Haible * msgcat.c (usage): Fix description of --use-first. diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am index 188a0e6a6..87cc35821 100644 --- a/gettext-tools/src/Makefile.am +++ b/gettext-tools/src/Makefile.am @@ -266,7 +266,7 @@ msgcmp_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD msgfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) msgmerge_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS) msgunfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) -xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ $(WOE32_LDADD) +xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ @LTLIBICONV@ $(WOE32_LDADD) msgattrib_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) msgcat_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD) msgcomm_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)