branch - upgrade to GPLv3+

Index: GNUmakefile
===================================================================
RCS file: /sources/m4/m4/Attic/GNUmakefile,v
retrieving revision 1.1.2.1
diff -u -p -r1.1.2.1 GNUmakefile
--- GNUmakefile	2 Jul 2006 01:34:24 -0000	1.1.2.1
+++ GNUmakefile	5 Jul 2007 03:43:40 -0000
@@ -4,11 +4,11 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
Index: HACKING
===================================================================
RCS file: /sources/m4/m4/HACKING,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 HACKING
--- HACKING	25 Sep 2006 12:35:32 -0000	1.1.2.5
+++ HACKING	5 Jul 2007 03:43:40 -0000
@@ -396,14 +396,14 @@ issue.
 
 
 -- 
-Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 The canonical source of this file is maintained with the
 GNU M4 package.  Report bugs to [email protected].
 
 GNU M4 is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
-published by the Free Software Foundation; either version 2
+published by the Free Software Foundation; either version 3
 of the License, or (at your option) any later version.
 
 GNU M4 is distributed in the hope that it will be useful,
Index: Makefile.am
===================================================================
RCS file: /sources/m4/m4/Makefile.am,v
retrieving revision 1.25.2.12
diff -u -p -r1.25.2.12 Makefile.am
--- Makefile.am	28 May 2007 17:07:03 -0000	1.25.2.12
+++ Makefile.am	5 Jul 2007 03:43:40 -0000
@@ -5,7 +5,7 @@
 ##
 ## 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
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## This program is distributed in the hope that it will be useful,
Index: Makefile.maint
===================================================================
RCS file: /sources/m4/m4/Attic/Makefile.maint,v
retrieving revision 1.1.2.9
diff -u -p -r1.1.2.9 Makefile.maint
--- Makefile.maint	25 Aug 2006 14:01:34 -0000	1.1.2.9
+++ Makefile.maint	5 Jul 2007 03:43:40 -0000
@@ -1,10 +1,10 @@
 ## Makefile.maint -- Makefile rules for m4 maintainers -*-Makefile-*-
 ##
-## Copyright (C) 2004, 2005, 2006 Free Software Foundation
+## Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation
 ##
 ## 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
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## This program is distributed in the hope that it will be useful,
Index: NEWS
===================================================================
RCS file: /sources/m4/m4/NEWS,v
retrieving revision 1.1.1.1.2.105
diff -u -p -r1.1.1.1.2.105 NEWS
--- NEWS	30 May 2007 04:30:16 -0000	1.1.1.1.2.105
+++ NEWS	5 Jul 2007 03:43:40 -0000
@@ -4,7 +4,7 @@ Foundation, Inc.
 
 Version 1.4.10 - ?? ??? 2007, by ????  (CVS version 1.4.9c)
 
-* No changes yet...
+* Upgrade from GPL version 2 to GPL version 3 or later.
 
 Version 1.4.9b - 29 May 2007, by Eric Blake  (CVS version 1.4.9a)
 
Index: README
===================================================================
RCS file: /sources/m4/m4/README,v
retrieving revision 1.1.1.1.2.4
diff -u -p -r1.1.1.1.2.4 README
--- README	21 Sep 2006 13:07:02 -0000	1.1.1.1.2.4
+++ README	5 Jul 2007 03:43:40 -0000
@@ -23,7 +23,12 @@ from trivial test files to rather advanc
 use m4 seriously, you might find useful material down there.
 
 See file `BACKLOG' for a summary of pending mail and articles.
-See file `COPYING' for copying conditions.
+See file `COPYING' for copying conditions.  Note that M4 is distributed
+under the GNU Public License version 3 or later.  Some files in the
+distribution are copied from the gnulib project, and hence bear the
+designation version 2 or later because they are unmodified from gnulib;
+however, if you modify these files using M4 rather than gnulib as the
+source, you must update the license to be GPLv3 or later.
 See file `INSTALL' for compilation and installation instructions.
 See file `NEWS' for a list of major changes in the current release.
 See file `THANKS' for a list of contributors.
Index: bootstrap
===================================================================
RCS file: /sources/m4/m4/bootstrap,v
retrieving revision 1.31.2.4
diff -u -p -r1.31.2.4 bootstrap
--- bootstrap	21 Sep 2006 13:07:02 -0000	1.31.2.4
+++ bootstrap	5 Jul 2007 03:43:40 -0000
@@ -1,15 +1,15 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2006-09-21
+# bootstrap (GNU M4) version 2007-07-04
 # Written by Gary V. Vaughan  <[email protected]>
 
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -255,7 +255,7 @@ func_update "$gnulibdir"/build-aux/insta
 func_update "$gnulibdir"/build-aux/mdate-sh doc/mdate-sh
 func_update "$gnulibdir"/build-aux/missing missing
 func_update "$gnulibdir"/build-aux/texinfo.tex doc/texinfo.tex
-func_update "$gnulibdir"/doc/COPYING COPYING
+func_update "$gnulibdir"/doc/COPYINGv3 COPYING
 func_update "$gnulibdir"/doc/INSTALL INSTALL
 
 exit 0
Index: commit
===================================================================
RCS file: /sources/m4/m4/commit,v
retrieving revision 1.6.2.1
diff -u -p -r1.6.2.1 commit
--- commit	2 Jul 2006 01:34:46 -0000	1.6.2.1
+++ commit	5 Jul 2007 03:43:40 -0000
@@ -4,13 +4,13 @@
 # Written by Gary V. Vaughan <[email protected]>
 # and Alexandre Oliva <[email protected]>
 
-# Copyright (C) 1999, 2000, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2004, 2006, 2007 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
Index: configure.ac
===================================================================
RCS file: /sources/m4/m4/configure.ac,v
retrieving revision 1.36.2.42
diff -u -p -r1.36.2.42 configure.ac
--- configure.ac	30 May 2007 04:30:16 -0000	1.36.2.42
+++ configure.ac	5 Jul 2007 03:43:40 -0000
@@ -4,7 +4,7 @@
 #
 # 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
Index: gpl-3.0.texi.diff
===================================================================
RCS file: gpl-3.0.texi.diff
diff -N gpl-3.0.texi.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gpl-3.0.texi.diff	5 Jul 2007 03:43:40 -0000
@@ -0,0 +1,36 @@
+--- ../gnulib/doc/gpl-3.0.texi	2007-07-04 11:50:35.890625000 -0600
++++ doc/gpl-3.0.texi	2007-07-04 20:58:11.468750000 -0600
+@@ -1,5 +1,5 @@
+ @node Copying
+-@unnumbered GNU General Public License
++@appendixsec GNU General Public License
+ @center Version 3, 29 June 2007
+ 
+ @c This file is intended to be included in another file.
+@@ -222,7 +222,7 @@
+ conditions:
+ 
+ @enumerate a
+-@item 
++@item
+ The work must carry prominent notices stating that you modified it,
+ and giving a relevant date.
+ 
+@@ -670,7 +670,7 @@
+ the ``copyright'' line and a pointer to where the full notice is found.
+ 
+ @smallexample
+-@var{one line to give the program's name and a brief idea of what it does.}  
++@var{one line to give the program's name and a brief idea of what it does.}
+ Copyright (C) @var{year} @var{name of author}
+ 
+ This program is free software: you can redistribute it and/or modify
+@@ -693,7 +693,7 @@
+ notice like this when it starts in an interactive mode:
+ 
+ @smallexample
+-@var{program} Copyright (C) @var{year} @var{name of author} 
++@var{program} Copyright (C) @var{year} @var{name of author}
+ This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type @samp{show c} for details.
Index: version-etc.c.diff
===================================================================
RCS file: version-etc.c.diff
diff -N version-etc.c.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ version-etc.c.diff	5 Jul 2007 03:43:40 -0000
@@ -0,0 +1,20 @@
+--- ../gnulib/lib/version-etc.c	2007-03-24 07:08:51.698250000 -0600
++++ lib/version-etc.c	2007-07-04 20:26:39.296875000 -0600
+@@ -3,7 +3,7 @@
+ 
+    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
+-   the Free Software Foundation; either version 2, or (at your option)
++   the Free Software Foundation; either version 3, or (at your option)
+    any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+@@ -67,7 +67,7 @@
+ 
+   fputs (_("\
+ \n\
+-License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n\
++License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n\
+ This is free software: you are free to change and redistribute it.\n\
+ There is NO WARRANTY, to the extent permitted by law.\n\
+ \n\
Index: checks/Makefile.in
===================================================================
RCS file: /sources/m4/m4/checks/Attic/Makefile.in,v
retrieving revision 1.1.1.1.2.11
diff -u -p -r1.1.1.1.2.11 Makefile.in
--- checks/Makefile.in	14 Jul 2006 15:15:58 -0000	1.1.1.1.2.11
+++ checks/Makefile.in	5 Jul 2007 03:43:40 -0000
@@ -1,9 +1,9 @@
 ##
-## Copyright (C) 1992, 1993, 1994, 2006 Free Software Foundation, Inc.
+## Copyright (C) 1992, 1993, 1994, 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
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## This program is distributed in the hope that it will be useful,
Index: doc/.cvsignore
===================================================================
RCS file: /sources/m4/m4/doc/.cvsignore,v
retrieving revision 1.3.2.8
diff -u -p -r1.3.2.8 .cvsignore
--- doc/.cvsignore	13 Jul 2006 12:51:41 -0000	1.3.2.8
+++ doc/.cvsignore	5 Jul 2007 03:43:40 -0000
@@ -1,5 +1,6 @@
 fdl.texi
 gendocs_template
+gpl-3.0.texi
 m4.1
 m4.??
 m4.???
Index: doc/Makefile.am
===================================================================
RCS file: /sources/m4/m4/doc/Attic/Makefile.am,v
retrieving revision 1.8.2.8
diff -u -p -r1.8.2.8 Makefile.am
--- doc/Makefile.am	27 Jul 2006 18:12:08 -0000	1.8.2.8
+++ doc/Makefile.am	5 Jul 2007 03:43:40 -0000
@@ -1,10 +1,10 @@
 ## This file is part of GNU M4.
 ##
-## Copyright (C) 2006 Free Software Foundation, Inc.
+## Copyright (C) 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
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## This program is distributed in the hope that it will be useful,
Index: doc/m4.texinfo
===================================================================
RCS file: /sources/m4/m4/doc/m4.texinfo,v
retrieving revision 1.1.1.1.2.129
diff -u -p -r1.1.1.1.2.129 m4.texinfo
--- doc/m4.texinfo	26 Jun 2007 11:30:39 -0000	1.1.1.1.2.129
+++ doc/m4.texinfo	5 Jul 2007 03:43:40 -0000
@@ -137,6 +137,7 @@ changeword will go away and @emph{you sh
 
 * Compatibility::               Compatibility with other versions of @code{m4}
 * Answers::                     Correct version of some examples
+* Copying This Package::        How to make copies of the overall M4 package
 * Copying This Manual::         How to make copies of this manual
 * Indices::                     Indices of concepts and macros
 
@@ -270,8 +271,9 @@ Correct version of some examples
 * Improved cleardivert::        Solution for @code{cleardivert}
 * Improved fatal_error::        Solution for @code{fatal_error}
 
-How to make copies of this manual
+How to make copies of this package or manual
 
+* Copying::                     GNU General Public License
 * GNU Free Documentation License::  License for copying this manual
 
 Indices of concepts and macros
@@ -6750,9 +6752,28 @@ fatal_error(`inside wrapped text')')
 
 @c ========================================================== Appendices
 
+@node Copying This Package
+@appendix How to make copies of the overall M4 package
+@cindex License, code
+
+This appendix covers the license for copying the source code of the
+overall M4 package.  This manual is under a different set of
+restrictions, covered later (@pxref{Copying This Manual}).
+
+@menu
+* Copying::                     GNU General Public License
+@end menu
+
+@include gpl-3.0.texi
+
 @node Copying This Manual
 @appendix How to make copies of this manual
-@cindex License
+@cindex License, manual
+
+This appendix covers the license for copying this manual.  Note that
+some of the longer examples in this manual are also distributed in the
+directory @file{m4-@value{VERSION}/@/examples/}, where a more
+permissive license is in effect when copying just the examples.
 
 @menu
 * GNU Free Documentation License::  License for copying this manual
Index: examples/Makefile.am
===================================================================
RCS file: /sources/m4/m4/examples/Attic/Makefile.am,v
retrieving revision 1.9.2.3
diff -u -p -r1.9.2.3 Makefile.am
--- examples/Makefile.am	27 Oct 2006 12:13:13 -0000	1.9.2.3
+++ examples/Makefile.am	5 Jul 2007 03:43:40 -0000
@@ -1,10 +1,10 @@
 ## This file is part of GNU M4.
 ##
-## Copyright (C) 2006 Free Software Foundation, Inc.
+## Copyright (C) 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
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## This program is distributed in the hope that it will be useful,
Index: m4/gnulib-cache.m4
===================================================================
RCS file: /sources/m4/m4/m4/Attic/gnulib-cache.m4,v
retrieving revision 1.1.2.28
diff -u -p -r1.1.2.28 gnulib-cache.m4
--- m4/gnulib-cache.m4	26 Jun 2007 15:32:57 -0000	1.1.2.28
+++ m4/gnulib-cache.m4	5 Jul 2007 03:43:40 -0000
@@ -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=. --with-tests --no-libtool --macro-prefix=M4 assert avltree-oset binary-io clean-temp cloexec close-stream closein config-h error fdl fflush fopen-safer free fseeko gendocs getopt gnupload mkstemp obstack regex stdbool stdint stdlib-safer strtol unlocked-io vasprintf-posix verror version-etc-fsf xalloc xvasprintf
+#   gnulib-tool --import --dir=. --local-dir=. --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --aux-dir=. --with-tests --no-libtool --macro-prefix=M4 assert avltree-oset binary-io clean-temp cloexec close-stream closein config-h error fdl fflush fopen-safer free fseeko gendocs getopt gnupload gpl-3.0 mkstemp obstack regex stdbool stdint stdlib-safer strtol unlocked-io vasprintf-posix verror version-etc version-etc-fsf xalloc xvasprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_LOCAL_DIR([])
-gl_MODULES([assert avltree-oset binary-io clean-temp cloexec close-stream closein config-h error fdl fflush fopen-safer free fseeko gendocs getopt gnupload mkstemp obstack regex stdbool stdint stdlib-safer strtol unlocked-io vasprintf-posix verror version-etc-fsf xalloc xvasprintf])
+gl_LOCAL_DIR([.])
+gl_MODULES([assert avltree-oset binary-io clean-temp cloexec close-stream closein config-h error fdl fflush fopen-safer free fseeko gendocs getopt gnupload gpl-3.0 mkstemp obstack regex stdbool stdint stdlib-safer strtol unlocked-io vasprintf-posix verror version-etc version-etc-fsf xalloc xvasprintf])
 gl_AVOID([])
 gl_SOURCE_BASE([lib])
 gl_M4_BASE([m4])
Index: src/Makefile.am
===================================================================
RCS file: /sources/m4/m4/src/Attic/Makefile.am,v
retrieving revision 1.18.2.4
diff -u -p -r1.18.2.4 Makefile.am
--- src/Makefile.am	17 Oct 2006 16:13:03 -0000	1.18.2.4
+++ src/Makefile.am	5 Jul 2007 03:43:40 -0000
@@ -1,10 +1,10 @@
 ## This file is part of GNU M4.
 ##
-## Copyright (C) 2006 Free Software Foundation, Inc.
+## Copyright (C) 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
-## the Free Software Foundation; either version 2 of the License, or
+## the Free Software Foundation; either version 3 of the License, or
 ## (at your option) any later version.
 ##
 ## This program is distributed in the hope that it will be useful,
Index: src/builtin.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/builtin.c,v
retrieving revision 1.1.1.1.2.59
diff -u -p -r1.1.1.1.2.59 builtin.c
--- src/builtin.c	28 Feb 2007 13:48:19 -0000	1.1.1.1.2.59
+++ src/builtin.c	5 Jul 2007 03:43:40 -0000
@@ -5,7 +5,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/debug.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/debug.c,v
retrieving revision 1.1.1.1.2.13
diff -u -p -r1.1.1.1.2.13 debug.c
--- src/debug.c	24 May 2007 17:23:43 -0000	1.1.1.1.2.13
+++ src/debug.c	5 Jul 2007 03:43:40 -0000
@@ -5,7 +5,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/eval.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/eval.c,v
retrieving revision 1.1.1.1.2.10
diff -u -p -r1.1.1.1.2.10 eval.c
--- src/eval.c	25 Apr 2007 14:04:13 -0000	1.1.1.1.2.10
+++ src/eval.c	5 Jul 2007 03:43:40 -0000
@@ -5,7 +5,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/freeze.c
===================================================================
RCS file: /sources/m4/m4/src/freeze.c,v
retrieving revision 1.1.1.1.2.15
diff -u -p -r1.1.1.1.2.15 freeze.c
--- src/freeze.c	25 May 2007 17:27:37 -0000	1.1.1.1.2.15
+++ src/freeze.c	5 Jul 2007 03:43:40 -0000
@@ -5,7 +5,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/input.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/input.c,v
retrieving revision 1.1.1.1.2.35
diff -u -p -r1.1.1.1.2.35 input.c
--- src/input.c	25 May 2007 17:27:37 -0000	1.1.1.1.2.35
+++ src/input.c	5 Jul 2007 03:43:40 -0000
@@ -5,7 +5,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/m4.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/m4.c,v
retrieving revision 1.1.1.1.2.47
diff -u -p -r1.1.1.1.2.47 m4.c
--- src/m4.c	24 May 2007 17:23:43 -0000	1.1.1.1.2.47
+++ src/m4.c	5 Jul 2007 03:43:40 -0000
@@ -5,7 +5,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/m4.h
===================================================================
RCS file: /sources/m4/m4/src/m4.h,v
retrieving revision 1.1.1.1.2.43
diff -u -p -r1.1.1.1.2.43 m4.h
--- src/m4.h	25 May 2007 17:27:37 -0000	1.1.1.1.2.43
+++ src/m4.h	5 Jul 2007 03:43:40 -0000
@@ -5,7 +5,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/macro.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/macro.c,v
retrieving revision 1.1.1.1.2.18
diff -u -p -r1.1.1.1.2.18 macro.c
--- src/macro.c	25 May 2007 20:29:18 -0000	1.1.1.1.2.18
+++ src/macro.c	5 Jul 2007 03:43:41 -0000
@@ -5,7 +5,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/output.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/output.c,v
retrieving revision 1.1.1.1.2.22
diff -u -p -r1.1.1.1.2.22 output.c
--- src/output.c	31 May 2007 13:28:22 -0000	1.1.1.1.2.22
+++ src/output.c	5 Jul 2007 03:43:41 -0000
@@ -5,7 +5,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/path.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/path.c,v
retrieving revision 1.1.1.1.2.13
diff -u -p -r1.1.1.1.2.13 path.c
--- src/path.c	1 Nov 2006 13:44:54 -0000	1.1.1.1.2.13
+++ src/path.c	5 Jul 2007 03:43:41 -0000
@@ -1,11 +1,11 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 2004, 2006 Free Software
-   Foundation, Inc.
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 2004, 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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/stackovf.c
===================================================================
RCS file: /sources/m4/m4/src/stackovf.c,v
retrieving revision 1.1.1.1.2.7
diff -u -p -r1.1.1.1.2.7 stackovf.c
--- src/stackovf.c	13 Jan 2007 13:33:13 -0000	1.1.1.1.2.7
+++ src/stackovf.c	5 Jul 2007 03:43:41 -0000
@@ -4,7 +4,7 @@
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
Index: src/symtab.c
===================================================================
RCS file: /sources/m4/m4/src/Attic/symtab.c,v
retrieving revision 1.1.1.1.2.15
diff -u -p -r1.1.1.1.2.15 symtab.c
--- src/symtab.c	1 Nov 2006 22:29:08 -0000	1.1.1.1.2.15
+++ src/symtab.c	5 Jul 2007 03:43:41 -0000
@@ -1,11 +1,11 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2003, 2006 Free
+   Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 2003, 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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,