check: enable gnulib's testsuite

* Makefile.am (SUBDIRS): Add gnulib-tests.
(EXTRA_DIST): Distribute also update-copyright script.  This does
not happen automatically because we manually remove ./lib
directory created by gnulib-tool.  Not having the file distributed
causes 'make check' failure, however.
(dotversion): Fix to point to $(top_srcdir).
* bootstrap.conf (gnulib_tool_options): Add gnulib-tool args
needed to successfully install gnulib's tests.
* configure.ac (CONFIG_STATUS_DEPENDENCIES): Look for .version in
$(top_srcdir).
* gnulib: Sync with upstream.
* build-aux/.gitignore: Ignore ar-lib coming from automake.
This commit is contained in:
Pavel Raiskup 2015-10-12 22:52:29 +02:00
parent 9187e9a231
commit ed4f739f62
7 changed files with 12 additions and 6 deletions

1
.gitignore vendored
View File

@ -41,6 +41,7 @@
/INSTALL
/README-release
/gnulib-local
/gnulib-tests
/libtoolize
/libtoolize.in
/maint.mk

View File

@ -27,7 +27,7 @@ ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS =
AM_LDFLAGS =
SUBDIRS = .
SUBDIRS = . gnulib-tests
DIST_SUBDIRS = $(SUBDIRS)
EXTRA_DIST =
@ -88,11 +88,12 @@ ltversion_in = $(srcdir)/$(macro_dir)/ltversion.in
ltversion_m4 = $(srcdir)/$(macro_dir)/ltversion.m4
no_bogus_macros = $(srcdir)/$(aux_dir)/no-bogus-m4-defines
options_parser = $(srcdir)/$(aux_dir)/options-parser
u2d_copyright = $(srcdir)/$(aux_dir)/update-copyright
EXTRA_DIST += $(extract_trace) $(funclib_sh) $(inline_source) \
$(libtoolize_in) $(ltmain_in) $(ltmain_sh) \
$(ltversion_in) $(ltversion_m4) $(no_bogus_macros) \
$(options_parser)
$(options_parser) $(u2d_copyright)
## These are the replacements that need to be made at bootstrap time,
## because they must be static in distributed files, and not accidentally
@ -538,7 +539,7 @@ git_log_fix = $(srcdir)/$(aux_dir)/git-log-fix
thanks_gen = $(srcdir)/$(aux_dir)/thanks-gen
dotserial = $(distdir)/.serial
dotversion = $(srcdir)/.version
dotversion = $(top_srcdir)/.version
tarball_version = $(distdir)/.tarball-version
readme = $(distdir)/README
changelog = $(distdir)/ChangeLog

2
NEWS
View File

@ -8,6 +8,8 @@ NEWS - list of user-visible changes between releases of GNU Libtool
variable, which obsoletes AR_FLAGS. This is due to naming conventions
among other *FLAGS and to be consistent with Automake's ARFLAGS.
- Gnulib testsuite is enabled and run during 'make check'.
** Important incompatible changes:
- Libtool changed ARFLAGS/AR_FLAGS default from 'cru' to 'cr'.

View File

@ -61,6 +61,7 @@ gnulib_tool_options=$gnulib_tool_options"
--avoid=dummy
--libtool
--macro-prefix=GL
--with-tests --tests-base=gnulib-tests
"
# gnulib modules used by this package.

View File

@ -1,4 +1,5 @@
/announce-gen
/ar-lib
/compile
/depcomp
/do-release-commit-and-tag

View File

@ -111,7 +111,7 @@ AB_INIT([$autobuild_mode])
dnl Make sure config.status is regenerated when the version timestamp changes
AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(srcdir)/.version'])
AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/.version'])
## ------------------------------- ##
@ -182,5 +182,5 @@ AM_MISSING_PROG([HELP2MAN], [help2man])
## -------- ##
## Outputs. ##
## -------- ##
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([Makefile gnulib-tests/Makefile])
AC_OUTPUT

2
gnulib

@ -1 +1 @@
Subproject commit a5a1569d1953536af019636c49bd3e7a5cbbbde2
Subproject commit 82d514b0645efd10b2b68b911372ae84e1a54da4