summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-06-04 16:02:28 +0200
committerBruno Haible <bruno@clisp.org>2011-06-07 23:39:49 +0200
commit8f50aada29808c6c4f5d39fa151f5eaf632f509e (patch)
treef94f6519084a7481be3ec132a96abb3311491ee6
parentfcf0f235f4dd3e6ceb2149002834223b1c7e9f47 (diff)
downloadgettext-8f50aada29808c6c4f5d39fa151f5eaf632f509e.tar.gz
Avoid link error when linking statically on AIX 7.
-rw-r--r--gettext-tools/src/ChangeLog5
-rw-r--r--gettext-tools/src/Makefile.am2
2 files changed, 6 insertions, 1 deletions
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 <bruno@clisp.org>
+
+ Avoid link error when linking statically on AIX 7.
+ * Makefile.am (xgettext_LDADD): Add LTLIBICONV.
+
2011-04-13 Bruno Haible <bruno@clisp.org>
* 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)