From: Bruno Haible <bruno@clisp.org>
Date: Sun, 10 Oct 2010 12:15:11 +0000 (+0200)
Subject: Update after gnulib changed.
X-Git-Tag: v0.18.2~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eade51378d01552217fd73454bbb93c88edcda30;p=thirdparty%2Fgettext.git

Update after gnulib changed.
---

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index dd8f4045e..60c9d8790 100644
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-10  Bruno Haible  <bruno@clisp.org>
+
+	* modules/gettext-tools-misc (Makefile.am): Remove flags from
+	libgettextlib_la_LDFLAGS that are now generated by gnulib-tool.
+
 2010-08-29  Bruno Haible  <bruno@clisp.org>
 
 	* modules/regex.diff: Update after gnulib changed.
diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
index b28104964..d90884788 100644
--- a/gnulib-local/modules/gettext-tools-misc
+++ b/gnulib-local/modules/gettext-tools-misc
@@ -19,10 +19,13 @@ lib_LTLIBRARIES = libgettextlib.la
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because linebreak.c and striconv.c use iconv().
 # Need @LIB_ACL@ because copy-file.c uses acl.h.
+# As of 2010-10-04, these are all added by gnulib-tool automatically.
+#lib_LDFLAGS += $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@
+
 # Need @LTLIBC@ for -no-undefined to work on many platforms.
 lib_LDFLAGS += \
   -release @VERSION@ \
-  $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@ @LTLIBC@ @LTNOUNDEF@
+  @LTLIBC@ @LTNOUNDEF@
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL