Avoid linking with libstdc++ when not needed.

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 36d206aedfc7f1bc320a3ee6accae8912e83646b..e22fa00e2f959baa957827fde16f2341a5399792 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-09  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (CXXLINK) [!mingw]: Overwrite automake's value. Fixes
+       unintended dependency on libstdc++ introduced on 2005-07-05.
+
 2005-10-09  Bruno Haible  <bruno@clisp.org>
 
        * lang-table.h: New file.

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index a89e598ba69dfdc682122b5e18d34baa71706349..386cf6085586b61e0fe40bba96cc3092fcde4f26 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -89,6 +89,11 @@ JAVACOMP = $(SHELL) ../lib/javacomp.sh
 CSHARPCOMP = $(SHELL) ../lib/csharpcomp.sh
 CSHARPCOMPFLAGS = @CSHARPCOMPFLAGS@
 
+# Linking with C++ libraries is needed _only_ on mingw.
+if !MINGW
+@MINGW_FALSE@CXXLINK = $(LINK)
+endif
+
 
 # All programs deal with message lists.
 # All programs must read PO files. (msgunfmt also, for read-java.c,