Fix problem with automake's definition of CXXLINK.

diff --git a/ChangeLog b/ChangeLog
index c06ff8f1a887c04dd3dcd59765e38fc03d9b5052..b6d8f41be30cc18d2772c204e41a6c1253df2f3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/gnulib-tool b/gnulib-tool
index b5e987fe111f7763c9717e9dbeefa96dd0aa5464..0517bd47d32b0e4539b32ae55a69413ed4269617 100755 (executable)
--- 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