[SCM] GNU M4 source repository branch, master, updated. cvs-readonly-93-geef195f

[Eric Blake]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU M4 source repository".

http://git.sv.gnu.org/gitweb/?p=m4.git;a=commitdiff;h=eef195f8cdc361d819914e82fcf2b0bdf559000c

The branch, master has been updated
       via  eef195f8cdc361d819914e82fcf2b0bdf559000c (commit)
       via  49e254060b37619143095d979c9ad087ca57bd05 (commit)
      from  38f06945a35f382d5f7ab12d8d32184d544ba234 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eef195f8cdc361d819914e82fcf2b0bdf559000c
Author: Eric Blake <address@hidden>
Date:   Thu Apr 10 16:27:47 2008 -0600

    Ensure __m4_version__ is unquoted.
    
    * tests/builtins.at (__m4_@&address@hidden): Augment test.
    
    Signed-off-by: Eric Blake <address@hidden>

commit 49e254060b37619143095d979c9ad087ca57bd05
Author: Eric Blake <address@hidden>
Date:   Mon Apr 14 06:31:13 2008 -0600

    Avoid GNU make failure on tarball.
    
    * Makefile.am (EXTRA_DIST): Distribute cfg.mk and maint.mk.
    
    Signed-off-by: Eric Blake <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    8 ++++++++
 Makefile.am       |    2 +-
 tests/builtins.at |   10 +++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 26906ff..a034407 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 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:
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
 
 


hooks/post-receive
--
GNU M4 source repository