Fix definition of tests witness macro.

diff --git a/ChangeLog b/ChangeLog
index e97099c8c14391ec8c7ba5f0ed190bb3835ae4fb..baec7e7d9be1ffdf37b84f6b6d4030975690ec52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-28  Bruno Haible  <bruno@clisp.org>
+
+       Fix definition of tests witness macro.
+       * gnulib-tool (func_import): Fix definition of witness macro.
+
 2010-03-28  Bruno Haible  <bruno@clisp.org>
 
        Fix ioctl's protoype on glibc systems.

diff --git a/gnulib-tool b/gnulib-tool
index 47974e697fd08bd74f1f9c7dd530ee3f213c3bb9..ddc0574e6ddb629ef80c5e50183f2900c0849e46 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4355,7 +4355,9 @@ s,//*$,/,'
     # Define a tests witness macro that depends on the package.
     # PACKAGE is defined by AM_INIT_AUTOMAKE, PACKAGE_TARNAME is defined by AC_INIT.
     # See <http://lists.gnu.org/archive/html/automake/2009-05/msg00145.html>.
+    echo "changequote(,)dnl"
     echo "  ${macro_prefix}tests_WITNESS=IN_\`echo \"\${PACKAGE-\$PACKAGE_TARNAME}\" | LC_ALL=C tr 'a-z' 'A-Z' | LC_ALL=C sed -e 's/[^A-Z0-9_]/_/g'\`_GNULIB_TESTS"
+    echo "changequote([, ])dnl"
     echo "  AC_SUBST([${macro_prefix}tests_WITNESS])"
     echo "  gl_module_indicator_condition=\$${macro_prefix}tests_WITNESS"
     echo "  m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [\$gl_module_indicator_condition])"