Enable gnulib-tool's --with-tests option.

* bootstrap: After all is done, transform the generated gnulib-tests/gnulib.mk.
* bootstrap.conf (gnulib_tool_option_extras): Set it here.
* gnulib-tests/Makefile.am: New file.
* Makefile.am (SUBDIRS): Add gnulib-tests.
* configure.ac (AC_CONFIG_FILES): Add gnulib-tests/Makefile.
* m4/jm-macros.m4 (coreutils_MACROS) [ARGMATCH_DIE_DECL]: Omit the
"extern " prefix to "void usage ()", so that the macro string value can
be used to construct a function definition in gnulib's test-argmatch.c.

1 files changed, 6 insertions, 0 deletions

diff --git a/bootstrap b/bootstrap
index 1eec10f13..b1d17a33e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -598,4 +598,10 @@ if test $with_gettext = yes; then
   fi
 fi
 
+# Horrible, coreutils-specific kludge.
+# Change paths in gnulib-tests/gnulib.mk from "../.." to "..".
+m=gnulib-tests/gnulib.mk
+sed 's,\.\./\.\.,..,g' $m > $m-t
+mv -f $m-t $m
+
 echo "$0: done.  Now you can run './configure'."