From c369e79c60843d0c14d6a507016d347e40dcb7c0 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 10 Nov 2007 18:33:07 +0100 Subject: 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. --- m4/jm-macros.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'm4/jm-macros.m4') diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4 index 416cc9c2b..5a92d4a9e 100644 --- a/m4/jm-macros.m4 +++ b/m4/jm-macros.m4 @@ -1,4 +1,4 @@ -#serial 105 -*- autoconf -*- +#serial 106 -*- autoconf -*- dnl Misc type-related macros for coreutils. @@ -38,7 +38,7 @@ AC_DEFUN([coreutils_MACROS], # By default, argmatch should fail calling usage (1). AC_DEFINE(ARGMATCH_DIE, [usage (1)], [Define to the function xargmatch calls on failures.]) - AC_DEFINE(ARGMATCH_DIE_DECL, [extern void usage ()], + AC_DEFINE(ARGMATCH_DIE_DECL, [void usage ()], [Define to the declaration of the xargmatch failure function.]) # used by ls -- cgit v1.2.3-54-g00ecf