Avoid lang-c++ test failure.

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 7ba8aa1a4dbcd4a062d90515ab8a198a35c34362..75c202ed54a945882483dad9bb872d059865a50c 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-29  Bruno Haible  <bruno@clisp.org>
+
+       Avoid lang-c++ test failure.
+       * configure.ac: Invoke LT_LANG also for C++.
+
 2009-05-23  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac (AM_INIT_AUTOMAKE): Add 'silent-rules' option.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 7d8216e423fd009d02a95c24aeb0d34ca6e99a47..f454305b6635eba593d73b587af80f88f1704022 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -324,6 +324,9 @@ gt_LOCALE_JA
 dnl Checks for functions for the tests/*.c tests.
 AC_CHECK_FUNCS_ONCE([getrlimit setrlimit])
 
+dnl Prepares the libtool configuration for languages used by the tests.
+LT_LANG([C++])
+
 dnl Check whether to execute tests that rely on libasprintf.
 dnl This test must be consistent with gettext-runtime/configure.ac.
 if test "${enable_libasprintf+set}" = set; then

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index f427ea1eac9a7bff6bae94487a0d5acfd0167bf1..a971fa7712668ffe87f77bc17f4f7bc360db48a5 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-29  Bruno Haible  <bruno@clisp.org>
+
+       Avoid lang-c++ test failure.
+       * lang-c++: Pass --tag option to libtool.
+
 2009-05-21  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (AUTOMAKE_OPTIONS): Add 1.11 and color-tests.

diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index a959ca7be32954f40a9730eb73d0c14c79685430..e3420cd6e8ca2b35255afd359f40ae0e0c365faa 100755 (executable)
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -70,7 +70,7 @@ tmpfiles="$tmpfiles prog.${OBJEXT} prog${EXEEXT}"
 # ${CXXFLAGS} or ${CPPFLAGS}.
 ${CXX} -I.. -I../../gettext-runtime/libasprintf -I$top_srcdir/gnulib-lib -I../intl ${CXXFLAGS} ${CPPFLAGS} -c prog.cc \
   || exit 1
-${LIBTOOL} --quiet --mode=link ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
+${LIBTOOL} --quiet --mode=link --tag=CXX ${CXX} ${CXXFLAGS} ${LDFLAGS} -o prog prog.${OBJEXT} ../../gettext-runtime/libasprintf/libasprintf.la ../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
   || exit 1
 
 tmpfiles="$tmpfiles prog.tmp prog.pot"