Rely more on libtool.

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index f6519571568572b4e1234520bb126de86c9583bf..bf37a17541b9ddbde76ebebba4061abb0ccc2783 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-10  Bruno Haible  <bruno@clisp.org>
+
+       Rely more on libtool.
+       * configure.ac (LTNOUNDEF): Remove variable.
+
 2010-07-31  Bruno Haible  <bruno@clisp.org>
 
        Use new ansi-c++.m4 from gnulib.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 157f2e28d1e8cf7d0f5432c0d7c8e0ab5ae0cddc..845ca07da58be7758f1638c98ffa8ed969806627 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -97,14 +97,6 @@ dnl Prepares the libtool configuration for handling of Windows resources, and
 dnl sets the RC variable to a program that compiles Windows resource files.
 LT_LANG([Windows Resource])
 
-case "$host_os" in
-  # On Cygwin, without -no-undefined, a warning is emitted and only a static
-  # library is built.
-  beos* | mingw* | cygwin*) LTNOUNDEF='-no-undefined' ;;
-  *) LTNOUNDEF='' ;;
-esac
-AC_SUBST([LTNOUNDEF])
-
 dnl On mingw and Cygwin, we can activate special Makefile rules which add
 dnl version information to the shared libraries and executables.
 case "$host_os" in

diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog
index cd0a5c4bdf625cc54d030a9f0e8a5ab35b9b4a5a..1391f4943dd6132d409257e1884301d7fb7e170e 100644 (file)
--- a/gettext-tools/libgettextpo/ChangeLog
+++ b/gettext-tools/libgettextpo/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-07  Bruno Haible  <bruno@clisp.org>
+
+       Rely more on libtool.
+       * Makefile.am (libgettextpo_la_LDFLAGS): Use -no-undefined always.
+       Don't use @LTNOUNDEF@.
+
 2010-06-06  Bruno Haible  <bruno@clisp.org>
 
        Bug fixes in libgettextpo.

diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index a96c36de0d67d7f3c36851402ac413f99631a245..4b40e1ca19ea716615c3b0ed1f7825f1ebf09f46 100644 (file)
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/libgettextpo subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2011 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -102,7 +102,7 @@ libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING)
 libgettextpo_la_LDFLAGS = \
   -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \
   -rpath $(libdir) \
-  @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
+  @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index c878f240c668416932656e2725c4aab2ee86f83c..87202d3f50b0658431a36187b88eff102e05e60d 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-07  Bruno Haible  <bruno@clisp.org>
+
+       Rely more on libtool.
+       * Makefile.am (libgettextsrc_la_LDFLAGS): Use -no-undefined always.
+       Don't use @LTNOUNDEF@.
+
 2010-06-06  Bruno Haible  <bruno@clisp.org>
 
        Bug fixes in libgettextpo.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index d9e76464e1fd8ea633b6f217fb62eb02c2b2ebec..a37f7c725543923c9f6274680739da746aa0d75e 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gettext-tools/src subdirectory of GNU gettext
-## Copyright (C) 1995-1998, 2000-2010 Free Software Foundation, Inc.
+## Copyright (C) 1995-1998, 2000-2011 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -220,7 +220,7 @@ urlget_SOURCES = urlget.c
 # use iconv().
 libgettextsrc_la_LDFLAGS = \
   -release @VERSION@ \
-  ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ -lc @LTNOUNDEF@
+  ../gnulib-lib/libgettextlib.la $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 60c9d87901105b7ae3bd2855803eebc9589170db..7a8ee1449bc50516a9bff534c788bbcd88d79405 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-10  Bruno Haible  <bruno@clisp.org>
+
+       Rely more on libtool.
+       * modules/gettext-tools-misc (Makefile.am): Remove @LTLIBC@ flag from
+       libgettextlib_la_LDFLAGS, relying more on libtool. Remove @LTNOUNDEF@
+       flag from libgettextlib_la_LDFLAGS, now generated by gnulib-tool.
+
 2010-10-10  Bruno Haible  <bruno@clisp.org>
 
        * modules/gettext-tools-misc (Makefile.am): Remove flags from

diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
index d90884788a4034da4769e30c3efd36fadd45f60b..0aff53f67be1594272f13f999979799fc547219b 100644 (file)
--- a/gnulib-local/modules/gettext-tools-misc
+++ b/gnulib-local/modules/gettext-tools-misc
@@ -22,10 +22,7 @@ lib_LTLIBRARIES = libgettextlib.la
 # 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@ \
-  @LTLIBC@ @LTNOUNDEF@
+lib_LDFLAGS += -release @VERSION@
 
 # Tell the mingw or Cygwin linker which symbols to export.
 if WOE32DLL