Change gnulib-tool to support NetBSD's join

For backwards compatibility, the 4.4BSD join used by NetBSD supports a
"-a" option as if it was "-a 1 -a 2".  Unfortunately, this was done in
such a way that "-a 1" and "-a 2" need to be passed as "-a1" or "-a2".

diff --git a/ChangeLog b/ChangeLog
index 247d541df0fae34a90a9eaab8983690f6095b68f..21ce7d7fd6a64cd6fa1ae40c3a208205dd6b2b49 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-27  J.T. Conklin  <jtc@acorntoolworks.com>  (tiny change)
+
+       * gnulib-tool: change "join -a 2" to "join -a2", the latter is
+       required by the NetBSD (and perhaps other 4.4BSD derived) join.
+
 2011-04-27  Reuben Thomas  <rrt@sc3d.org>
        and Eric Blake  <eblake@redhat.com>
 

diff --git a/gnulib-tool b/gnulib-tool
index 9461027fe76155045496dc420b853bfde0a935af..49221f022ae17e5f12ebbaaf934deec8f387ad9a 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -2522,7 +2522,7 @@ func_show_module_list ()
   echo "Module list with included dependencies (indented):"
   echo "$specified_modules" | sed -e '/^$/d' -e 's/$/| /' > "$tmp"/specified-modules
   echo "$modules" | sed -e '/^$/d' \
-    | LC_ALL=C join -t '|' -a 2 "$tmp"/specified-modules - \
+    | LC_ALL=C join -t '|' -a2 "$tmp"/specified-modules - \
     | sed -e 's/^\(.*\)|.*/|\1/' -e 's/^/    /' -e 's/^    |\(.*\)$/  '"${bold_on}"'\1'"${bold_off}"'/'
 }