avoid new AC_REQUIRE expanded-before-required warnings

[gnulib.git] / gnulib-tool

diff --git a/gnulib-tool b/gnulib-tool
index 397f442..a1e604c 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2277,6 +2277,7 @@ func_emit_tests_Makefile_am ()
   #   "AM_GNU_GETTEXT used but SUBDIRS not defined"
   echo "SUBDIRS ="
   echo "TESTS ="
+  echo "XFAIL_TESTS ="
   echo "TESTS_ENVIRONMENT ="
   echo "noinst_PROGRAMS ="
   if ! $for_test; then
@@ -4500,7 +4501,7 @@ case $mode in
           sedexpr2='s,^[^/]*$,.,'
           sedexpr3='s,/[^/]*$,,'
           m4dirs=`sed -n -e "$sedexpr1" aclocal.m4 | sed -e "$sedexpr2" -e "$sedexpr3" | LC_ALL=C sort -u`
-          m4dirs_count=`echo "$m4dirs" | wc -l`
+          m4dirs_count=`printf %s "$m4dirs" | wc -l`
         fi
       fi
       if test $m4dirs_count = 0; then