couple of patches

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I noticed that GNU make on a 'make dist' tarball would fail, because I was
missing some files.  I also tightened the tests for __m4_version__, in
light of recent autoconf changes about AC_AUTOCONF_VERSION and other
version strings being treated with caution since they are unquoted.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkgDUbMACgkQ84KuGfSFAYDAaACfbabLH8FZ5FSLWpvpNQbCY0sB
rQIAnjeEeYj5KKZv7E8d+S4tI7YdlRy4
=qGSq
-----END PGP SIGNATURE-----

>From 49e254060b37619143095d979c9ad087ca57bd05 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Mon, 14 Apr 2008 06:31:13 -0600
Subject: [PATCH] Avoid GNU make failure on tarball.

* Makefile.am (EXTRA_DIST): Distribute cfg.mk and maint.mk.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog   |    5 +++++
 Makefile.am |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 26906ff..3e8d5d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-14  Eric Blake  <address@hidden>
+
+       Avoid GNU make failure on tarball.
+       * Makefile.am (EXTRA_DIST): Distribute cfg.mk and maint.mk.
+
 2008-04-10  Eric Blake  <address@hidden>
 
        Allow back-referenced macro names; fixes 2008-03-13 regression.
diff --git a/Makefile.am b/Makefile.am
index 9ae8189..dc4253b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,7 @@ include ltdl/Makefile.inc
 # given in build-aux/git-version-gen.
 AM_CPPFLAGS    += -Ignu -I$(srcdir)/gnu \
                  -Im4 -I$(srcdir)/m4
-EXTRA_DIST     += bootstrap .version \
+EXTRA_DIST     += bootstrap cfg.mk maint.mk .version \
                  $(config_macro_dir)/gnulib-cache.m4
 BUILT_SOURCES  += .version
 .version:
-- 
1.5.5


>From eef195f8cdc361d819914e82fcf2b0bdf559000c Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Thu, 10 Apr 2008 16:27:47 -0600
Subject: [PATCH] Ensure __m4_version__ is unquoted.

* tests/builtins.at (__m4_@&address@hidden): Augment test.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog         |    3 +++
 tests/builtins.at |   10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e8d5d0..a034407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-04-14  Eric Blake  <address@hidden>
 
+       Ensure __m4_version__ is unquoted.
+       * tests/builtins.at (__m4_@&address@hidden): Augment test.
+
        Avoid GNU make failure on tarball.
        * Makefile.am (EXTRA_DIST): Distribute cfg.mk and maint.mk.
 
diff --git a/tests/builtins.at b/tests/builtins.at
index 14be12d..2feae51 100644
--- a/tests/builtins.at
+++ b/tests/builtins.at
@@ -77,7 +77,7 @@ AT_CLEANUP
 
 AT_SETUP([__m4_@&address@hidden)
 
-AT_DATA([in], [[__m4_version__
+AT_DATA([in], [[defn(`__m4_version__')
 ]])
 AT_CHECK_M4([--version], [0], [stdout])
 AT_CHECK([[sed -e 's/.*(GNU M4\(.*\)) \([^ ]*\).*/\2\1/;q' < stdout]],
@@ -85,6 +85,14 @@ AT_CHECK([[sed -e 's/.*(GNU M4\(.*\)) \([^ ]*\).*/\2\1/;q' < 
stdout]],
 mv stdout expout
 AT_CHECK_M4([in], [0], [expout])
 
+dnl Prove that __m4_version__ is unquoted, by making '.' an active character.
+AT_DATA([in], [[changesyntax(`A.')define(`.', `errprint(`hi
+')undefine(`.').')dnl
+__m4_version__
+]])
+AT_CHECK_M4([in], [0], [expout], [[hi
+]])
+
 AT_CLEANUP
 
 
-- 
1.5.5