Update after gnulib changed.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index dd8f4045edf8e9f72192ec06b2f5c3efd11b55cf..60c9d87901105b7ae3bd2855803eebc9589170db 100644 (file)
--- 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 b28104964e12335701a539499f88969d7066a60f..d90884788a4034da4769e30c3efd36fadd45f60b 100644 (file)
--- 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