diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-12-15 01:31:16 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-12-15 01:31:16 +0100 |
| commit | c2c2b5a49b1ce37a42417037c3515864a808e53b (patch) | |
| tree | 2fd5ace5f7ac7d306b53c7b81dd075241e8d43f4 /Makefile.am | |
| parent | a00c31bc46b639828d0decc33380c16d256f7986 (diff) | |
| download | guile-c2c2b5a49b1ce37a42417037c3515864a808e53b.tar.gz | |
Use Gnulib's `localcharset', with local patches.
This follows Bruno Haible's suggestion at
<http://lists.gnu.org/archive/html/guile-devel/2011-11/msg00055.html>.
* m4/gnulib-cache.m4: Add `gl_LOCAL_DIR'; use `localcharset'.
* Makefile.am (EXTRA_DIST): Add gnulib-local/lib/localcharset.[ch].diff.
(TESTS_ENVIRONMENT): New variable.
* gnulib-local/lib/localcharset.c.diff,
gnulib-local/lib/localcharset.h.diff: New files.
* test-suite/Makefile.am (TESTS_ENVIRONMENT): Add
@LOCALCHARSET_TESTS_ENVIRONMENT@.
* test-suite/standalone/Makefile.am (TESTS_ENVIRONMENT): Likewise.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 3a97683e8..c62950aaa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,12 +42,15 @@ SUBDIRS = \ libguileincludedir = $(pkgincludedir)/$(GUILE_EFFECTIVE_VERSION) libguileinclude_HEADERS = libguile.h -EXTRA_DIST = LICENSE HACKING GUILE-VERSION \ - m4/ChangeLog-2008 \ - ChangeLog-2008 \ - .version +EXTRA_DIST = LICENSE HACKING GUILE-VERSION \ + m4/ChangeLog-2008 \ + ChangeLog-2008 \ + .version \ + gnulib-local/lib/localcharset.h.diff \ + gnulib-local/lib/localcharset.c.diff TESTS = check-guile +TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ ACLOCAL_AMFLAGS = -I m4 |