Happy new year

[Eric Blake]

I'm thinking I might eventually release M4 1.4.9 after all; I'd like to 
backport the POSIX compliance of eval, fix the regression in temp file max size 
for divert, clean up some uses of int where size_t was intended to avoid 
overflow problems, fix BSDI builds, and whatever else comes up in the next 
month or two.  So with that, the first order of business is fixing the 
copyright banner for the new year.

CVS head already uses version-etc-fsf, but the only way to get it right now is 
via ./bootstrap (ie. gnulib-tool --update alone won't pick up any updates).  
I've been playing with using dual gnulib libraries, now that gnulib-tool 
supports that, but it is still not mature enough to commit.

2007-01-03  Eric Blake  <address@hidden>

        * m4/gnulib-cache.m4: Augment with 'gnulib-tool --import
        version-etc-fsf'.
        * src/m4.c (AUTHORS, main): Use FSF wording for --version (plus
        it bumps the copyright year).

Index: src/m4.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/m4.c,v
retrieving revision 1.1.1.1.2.39
diff -u -r1.1.1.1.2.39 m4.c
--- src/m4.c    17 Dec 2006 04:22:34 -0000      1.1.1.1.2.39
+++ src/m4.c    3 Jan 2007 21:04:50 -0000
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006 Free
-   Software Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,6 +25,10 @@
 #include <limits.h>
 #include <signal.h>
 
+#include "version-etc.h"
+
+#define AUTHORS "Rene' Seindal"
+
 static void usage (int);
 
 /* Enable sync output for /lib/cpp (-s).  */
@@ -452,14 +456,7 @@
        break;
 
       case VERSION_OPTION:
-       printf ("%s\n", PACKAGE_STRING);
-       fputs ("\
-Copyright (C) 2006 Free Software Foundation, Inc.\n\
-This is free software; see the source for copying conditions.  There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
-\n\
-Written by Rene' Seindal.\n\
-", stdout);
+       version_etc (stdout, PACKAGE, PACKAGE_NAME, VERSION, AUTHORS, NULL);
        exit (EXIT_SUCCESS);
        break;
 
Index: m4/gnulib-cache.m4
===================================================================
RCS file: /sources/m4/m4/m4/Attic/gnulib-cache.m4,v
retrieving revision 1.1.2.20
diff -u -r1.1.2.20 gnulib-cache.m4
--- m4/gnulib-cache.m4  13 Nov 2006 19:10:56 -0000      1.1.2.20
+++ m4/gnulib-cache.m4  3 Jan 2007 21:04:50 -0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2004-2006 Free Software Foundation, Inc.
+# Copyright (C) 2004-2007 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
@@ -15,11 +15,11 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 --
doc-base=doc --aux-dir=. --no-libtool --macro-prefix=M4 avltree-oset binary-io 
clean-temp cloexec close-stream closeout config-h error fdl fopen-safer free 
gendocs getopt gnupload mkstemp obstack regex stdbool stdlib-safer strstr 
strtol unlocked-io verror xalloc xvasprintf
+#   gnulib-tool --import --dir=. --lib=libm4 --source-base=lib --m4-base=m4 --
doc-base=doc --aux-dir=. --no-libtool --macro-prefix=M4 avltree-oset binary-io 
clean-temp cloexec close-stream closeout config-h error fdl fopen-safer free 
gendocs getopt gnupload mkstemp obstack regex stdbool stdlib-safer strstr 
strtol unlocked-io verror version-etc-fsf xalloc xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
-gl_MODULES([avltree-oset binary-io clean-temp cloexec close-stream closeout 
config-h error fdl fopen-safer free gendocs getopt gnupload mkstemp obstack 
regex stdbool stdlib-safer strstr strtol unlocked-io verror xalloc xvasprintf])
+gl_MODULES([avltree-oset binary-io clean-temp cloexec close-stream closeout 
config-h error fdl fopen-safer free gendocs getopt gnupload mkstemp obstack 
regex stdbool stdlib-safer strstr strtol unlocked-io verror version-etc-fsf 
xalloc xvasprintf])
 gl_AVOID([])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])