From: Robert Millan <rmh.grub@aybabtu.com>
Date: Sat, 14 Nov 2009 13:45:02 +0000 (-0700)
Subject: gnulib-tool: correctly detect absence of m4 directories
X-Git-Tag: v0.1~5199
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=fb1b608caaa3de195f3d97356e95a165ef5517da;p=gnulib.git

gnulib-tool: correctly detect absence of m4 directories

$m4dirs is incorrectly counting.  In my particular case
(correct value: 0, detected value: 1), this resulted in gnulib-tool
silently exitting with no visible error (and no job done).

* gnulib-tool: Avoid extra newline on data passed to wc -l.

Signed-off-by: Eric Blake <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index c821d8dfe..5fbff63e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-14  Robert Millan  <rmh.grub@aybabtu.com>  (tiny change)
+
+	gnulib-tool: correctly detect absence of m4 directories
+	* gnulib-tool: Avoid extra newline on data passed to wc -l.
+
 2009-11-14  Jim Meyering  <meyering@redhat.com>
 
 	maint.mk: Prohibit inclusion of "xalloc.h" without use.
diff --git a/gnulib-tool b/gnulib-tool
index 397f442b3..aafd34503 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4500,7 +4500,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