From: Bruno Haible <bruno@clisp.org>
Date: Fri, 12 Mar 2010 12:03:12 +0000 (+0100)
Subject: Fix problem with automake's definition of CXXLINK.
X-Git-Tag: v0.1~4505
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=20ada92e56d0c94df0efe6899081129f17202d0f;p=gnulib.git

Fix problem with automake's definition of CXXLINK.
---

diff --git a/ChangeLog b/ChangeLog
index c06ff8f1a..b6d8f41be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-03-12  Bruno Haible  <bruno@clisp.org>
 
+	Fix problem with automake's definition of CXXLINK.
+	* gnulib-tool (func_create_testdir): After LT_INIT, also use LT_LANG.
+	Reported by Simon Josefsson and Ludovic Courtès.
+
+2010-03-12  Bruno Haible  <bruno@clisp.org>
+
 	* doc/gnulib-intro.texi (Steady Development): Mention Ian Beckwith's
 	stable releases.
 
diff --git a/gnulib-tool b/gnulib-tool
index b5e987fe1..0517bd47d 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4637,6 +4637,7 @@ func_create_testdir ()
        | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
      if test "$libtool" = true; then
        echo "LT_INIT([win32-dll])"
+       echo "LT_LANG([C++])"
        echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
        echo "gl_cond_libtool=true"
      else
@@ -4761,6 +4762,7 @@ func_create_testdir ()
      | sed -e '/^$/d;' -e 's/AC_REQUIRE(\[\([^()]*\)\])/\1/'
    if test "$libtool" = true; then
      echo "LT_INIT([win32-dll])"
+     echo "LT_LANG([C++])"
      echo "AM_CONDITIONAL([GL_COND_LIBTOOL], [true])"
      echo "gl_cond_libtool=true"
    else