mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-11-24 02:17:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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.
This commit is contained in:
Jim Meyering 2007-11-10 18:33:07 +01:00
parent 080ac77850
commit c369e79c60
7 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2007-11-14 Jim Meyering <meyering@redhat.com>
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.
2007-11-12 Benno Schulenberg <bensberg@justemail.net>
Clarify description of cp's -a option.

2
Makefile.am
View File

@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
SUBDIRS = lib src doc man po tests
SUBDIRS = lib src doc man po tests gnulib-tests
EXTRA_DIST = Makefile.cfg Makefile.maint GNUmakefile \
.prev-version THANKS-to-translators THANKStt.in \
.vg-suppressions \

6
bootstrap
View File

@ -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'."

2
bootstrap.conf
View File

@ -135,3 +135,5 @@ if test $gettext_external = 1; then
m4/visibility.m4
'
fi
gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"

1
configure.ac
View File

@ -336,6 +336,7 @@ AC_CONFIG_FILES(
po/Makefile.in
src/Makefile
tests/Makefile
gnulib-tests/Makefile
tests/chgrp/Makefile
tests/chmod/Makefile
tests/chown/Makefile

1
gnulib-tests/Makefile.am Normal file
View File

@ -0,0 +1 @@
include gnulib.mk

4
m4/jm-macros.m4
View File

@ -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