From MAILER-DAEMON Mon Jan 02 08:32:27 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cO2ix-00035K-CW
	for mharc-m4-commit@gnu.org; Mon, 02 Jan 2017 08:32:27 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47739)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cO2is-00033z-GS
	for m4-commit@gnu.org; Mon, 02 Jan 2017 08:32:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cO2ip-0001oK-5K
	for m4-commit@gnu.org; Mon, 02 Jan 2017 08:32:22 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:35724)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cO2ip-0001oG-1Q
	for m4-commit@gnu.org; Mon, 02 Jan 2017 08:32:19 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69750)
	id DFAF22201AD; Mon,  2 Jan 2017 13:32:18 +0000 (UTC)
From: "Eric Blake" <eblake@redhat.com>
To: m4-commit@gnu.org
Subject: [SCM] GNU M4 source repository branch, branch-1.4,
	updated. v1.4.18-2-g1023769
X-Git-Refname: refs/heads/branch-1.4
X-Git-Reftype: branch
X-Git-Oldrev: e0140bd91ce0d2dfcdd1df22472d81ed13489d46
X-Git-Newrev: 102376916e49b6aae85dc6ff0b59699205a74bdf
Message-Id: <20170102133218.DFAF22201AD@vcs.savannah.gnu.org>
Date: Mon,  2 Jan 2017 13:32:18 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: m4-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: git commit notices for  GNU m4 <m4-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/m4-commit/>
List-Post: <mailto:m4-commit@gnu.org>
List-Help: <mailto:m4-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2017 13:32:25 -0000

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=102376916e49b6aae85dc6ff0b59699205a74bdf

The branch, branch-1.4 has been updated
       via  102376916e49b6aae85dc6ff0b59699205a74bdf (commit)
      from  e0140bd91ce0d2dfcdd1df22472d81ed13489d46 (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 102376916e49b6aae85dc6ff0b59699205a74bdf
Author: Eric Blake <eblake@redhat.com>
Date:   Mon Jan 2 07:30:42 2017 -0600

    maint: bump copyright year
    
    Needed to keep 'make syntax-check' passing.
    
    * gnulib: Update to latest.
    * bootstrap: Regenerate.
    * all files: Use 'make update-copyright' to bump year.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

Summary of changes:
 AUTHORS                     |    4 ++--
 BACKLOG                     |    3 ++-
 ChangeLog-2014              |    4 ++--
 HACKING                     |    2 +-
 Makefile.am                 |    4 ++--
 NEWS                        |    3 ++-
 README                      |    2 +-
 THANKS                      |    2 +-
 TODO                        |    4 ++--
 acinclude.m4                |    4 ++--
 bootstrap                   |    8 ++++----
 bootstrap.conf              |    2 +-
 c-boxes.el                  |    4 ++--
 cfg.mk                      |    2 +-
 checks/Makefile.am          |    4 ++--
 checks/check-them           |    3 ++-
 checks/get-them             |    3 ++-
 checks/stackovf.test        |    4 ++--
 configure.ac                |    2 +-
 doc/Makefile.am             |    2 +-
 doc/m4.texi                 |    2 +-
 examples/Makefile.am        |    2 +-
 gl/build-aux/bootstrap.in   |    2 +-
 gl/build-aux/extract-trace  |    2 +-
 gl/build-aux/funclib.sh     |    2 +-
 gl/build-aux/inline-source  |    2 +-
 gl/build-aux/options-parser |    2 +-
 gnulib                      |    2 +-
 lib/Makefile.am             |    2 +-
 m4/gnulib-cache.m4          |    2 +-
 src/Makefile.am             |    2 +-
 src/builtin.c               |    4 ++--
 src/debug.c                 |    2 +-
 src/eval.c                  |    4 ++--
 src/format.c                |    4 ++--
 src/freeze.c                |    4 ++--
 src/input.c                 |    4 ++--
 src/m4.c                    |    4 ++--
 src/m4.h                    |    4 ++--
 src/macro.c                 |    4 ++--
 src/output.c                |    4 ++--
 src/path.c                  |    2 +-
 src/symtab.c                |    2 +-
 tests/Makefile.am           |    2 +-
 44 files changed, 68 insertions(+), 64 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 44b959b..551f082 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,8 +32,8 @@ Tim Rice                    tim@multitalents.net          2011-01-24
 
 ========================================================================
 
-Copyright (C) 2000, 2006-2007, 2009-2014, 2016 Free Software Foundation,
-Inc.
+Copyright (C) 2000, 2006-2007, 2009-2014, 2016-2017 Free Software
+Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/BACKLOG b/BACKLOG
index eeb59e2..4eed596 100644
--- a/BACKLOG
+++ b/BACKLOG
@@ -50,7 +50,8 @@ rmail/speed
  2. 05 Sep 94 <djm@va.pubnix.com> slowness
  3. 04 Oct 94 <pinard> Autoconf, m4, and dnl's.
 
-Copyright (C) 2000, 2006, 2009-2014, 2016 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006, 2009-2014, 2016-2017 Free Software Foundation,
+Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/ChangeLog-2014 b/ChangeLog-2014
index 0555e18..9d2fbec 100644
--- a/ChangeLog-2014
+++ b/ChangeLog-2014
@@ -5577,8 +5577,8 @@ Mon Jan 22 21:08:52 1990  Rene' Seindal (seindal at diku.dk)
 	coding: utf-8
 	End:
 
-	Copyright (C) 1990-1994, 2000-2001, 2003, 2005-2014, 2016 Free
-	Software Foundation, Inc.
+	Copyright (C) 1990-1994, 2000-2001, 2003, 2005-2014, 2016-2017
+	Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/HACKING b/HACKING
index c89abff..ceec56e 100644
--- a/HACKING
+++ b/HACKING
@@ -275,7 +275,7 @@ and is not part of a release distribution.
   After making edits, mail the diff to <bug-directory@gnu.org>.
 
 
-Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
+Copyright (C) 2004-2014, 2016-2017 Free Software Foundation, Inc.
 
 The canonical source of this file is maintained with the
 GNU M4 package.  Report bugs to bug-m4@gnu.org.
diff --git a/Makefile.am b/Makefile.am
index 9d294c2..7c2291a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2000-2001, 2003-2014, 2016 Free Software Foundation,
-## Inc.
+## Copyright (C) 2000-2001, 2003-2014, 2016-2017 Free Software
+## Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/NEWS b/NEWS
index 853e648..a357f30 100644
--- a/NEWS
+++ b/NEWS
@@ -724,7 +724,8 @@ mode: outline
 fill-column: 75
 End:
 
-Copyright (C) 1992-1994, 2004-2014, 2016 Free Software Foundation, Inc.
+Copyright (C) 1992-1994, 2004-2014, 2016-2017 Free Software Foundation,
+Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/README b/README
index d4ef916..acb00ab 100644
--- a/README
+++ b/README
@@ -66,7 +66,7 @@ note that the range specifies every single year in that closed interval.
 
 ========================================================================
 
-Copyright (C) 2000, 2005-2014, 2016 Free Software Foundation, Inc.
+Copyright (C) 2000, 2005-2014, 2016-2017 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/THANKS b/THANKS
index bcd99a1..137ada9 100644
--- a/THANKS
+++ b/THANKS
@@ -140,7 +140,7 @@ Local Variables:
 coding: utf-8
 End:
 
-Copyright (C) 2000, 2006-2014, 2016 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006-2014, 2016-2017 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/TODO b/TODO
index 55b5d1c..015c1e8 100644
--- a/TODO
+++ b/TODO
@@ -37,8 +37,8 @@ mode: outline
 outline-regexp: " *[-+*.] \\|"
 End:
 
-Copyright (C) 2000, 2006-2007, 2009-2014, 2016 Free Software Foundation,
-Inc.
+Copyright (C) 2000, 2006-2007, 2009-2014, 2016-2017 Free Software
+Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/acinclude.m4 b/acinclude.m4
index a465b1c..0d923eb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,6 +1,6 @@
 # Local additions to Autoconf macros.
-# Copyright (C) 1992, 1994, 2004, 2006, 2008-2014, 2016 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992, 1994, 2004, 2006, 2008-2014, 2016-2017 Free
+# Software Foundation, Inc.
 # Francois Pinard <pinard@iro.umontreal.ca>, 1992.
 #
 # This file is free software; the Free Software Foundation
diff --git a/bootstrap b/bootstrap
index 4b57abd..a4480d5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -5,7 +5,7 @@
 # Bootstrap an Autotooled package from checked-out sources.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2016-2017 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.
 
@@ -235,7 +235,7 @@ scriptversion=2014-01-03.01; # UTC
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014, 2016-2017 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.
 
@@ -1541,7 +1541,7 @@ scriptversion=2014-01-07.03; # UTC
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2016-2017 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.
 
@@ -2146,7 +2146,7 @@ func_version ()
 # Extract macro arguments from autotools input with GNU M4.
 # Written by Gary V. Vaughan, 2010
 #
-# Copyright (C) 2010-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2016-2017 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.
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 5f05173..5d5d24f 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,7 +1,7 @@
 # bootstrap.conf (GNU M4) version 2010-09-10
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010, 2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2014, 2016-2017 Free Software Foundation, Inc.
 
 # This file is part of GNU M4.
 #
diff --git a/c-boxes.el b/c-boxes.el
index d60484b..4ed1ae2 100644
--- a/c-boxes.el
+++ b/c-boxes.el
@@ -1,6 +1,6 @@
 ;;; Boxed comments for C mode.
-;;; Copyright (C) 1991-1994, 2008-2014, 2016 Free Software Foundation,
-;;; Inc.
+;;; Copyright (C) 1991-1994, 2008-2014, 2016-2017 Free Software
+;;; Foundation, Inc.
 ;;; Francois Pinard <pinard@iro.umontreal.ca>, April 1991.
 ;;;
 ;;; This file is part of GNU M4.
diff --git a/cfg.mk b/cfg.mk
index 145c188..2933950 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk.                           -*- makefile -*-
-# Copyright (C) 2003-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014, 2016-2017 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
diff --git a/checks/Makefile.am b/checks/Makefile.am
index 0fb5a63..e84c9ec 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am - template for generating Makefile via Automake.
 ##
-## Copyright (C) 1992-1994, 2006-2014, 2016 Free Software Foundation,
-## Inc.
+## Copyright (C) 1992-1994, 2006-2014, 2016-2017 Free Software
+## Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/checks/check-them b/checks/check-them
index a47b267..f824896 100755
--- a/checks/check-them
+++ b/checks/check-them
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Check GNU m4 against examples from the manual source.
-# Copyright (C) 1992, 2006-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 1992, 2006-2014, 2016-2017 Free Software Foundation,
+# Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/checks/get-them b/checks/get-them
index cfe8a9d..2233e67 100755
--- a/checks/get-them
+++ b/checks/get-them
@@ -1,7 +1,8 @@
 #!/bin/sh
 # -*- AWK -*-
 # Extract all examples from the manual source.
-# Copyright (C) 1992, 2005-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 1992, 2005-2014, 2016-2017 Free Software Foundation,
+# Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/checks/stackovf.test b/checks/stackovf.test
index 3924f1e..893f1e9 100755
--- a/checks/stackovf.test
+++ b/checks/stackovf.test
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This file is part of the GNU m4 testsuite
-# Copyright (C) 2000, 2003, 2007-2014, 2016 Free Software Foundation,
-# Inc.
+# Copyright (C) 2000, 2003, 2007-2014, 2016-2017 Free Software
+# Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/configure.ac b/configure.ac
index 78b8788..f8ed519 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Configure template for GNU M4.           -*-Autoconf-*-
-# Copyright (C) 1991, 1993-1994, 2004-2014, 2016 Free Software
+# Copyright (C) 1991, 1993-1994, 2004-2014, 2016-2017 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU M4.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 30faf3b..d0bf1dc 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006-2014, 2016 Free Software Foundation, Inc.
+## Copyright (C) 2006-2014, 2016-2017 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/doc/m4.texi b/doc/m4.texi
index bc50533..59f0212 100644
--- a/doc/m4.texi
+++ b/doc/m4.texi
@@ -40,7 +40,7 @@ This manual (@value{UPDATED}) is for GNU M4 (version
 @value{VERSION}), a package containing an implementation of the m4 macro
 language.
 
-Copyright @copyright{} 1989-1994, 2004-2014, 2016 Free Software
+Copyright @copyright{} 1989-1994, 2004-2014, 2016-2017 Free Software
 Foundation, Inc.
 
 @quotation
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9c99d5b..fe2940d 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006-2014, 2016 Free Software Foundation, Inc.
+## Copyright (C) 2006-2014, 2016-2017 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/gl/build-aux/bootstrap.in b/gl/build-aux/bootstrap.in
index 352a87d..cef2ce0 100755
--- a/gl/build-aux/bootstrap.in
+++ b/gl/build-aux/bootstrap.in
@@ -3,7 +3,7 @@
 # Bootstrap an Autotooled package from checked-out sources.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2016-2017 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.
 
diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
index 0ce0b0e..cc2a1ce 100755
--- a/gl/build-aux/extract-trace
+++ b/gl/build-aux/extract-trace
@@ -3,7 +3,7 @@
 # Extract macro arguments from autotools input with GNU M4.
 # Written by Gary V. Vaughan, 2010
 #
-# Copyright (C) 2010-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2016-2017 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.
 
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
index eb07f53..d00601b 100644
--- a/gl/build-aux/funclib.sh
+++ b/gl/build-aux/funclib.sh
@@ -4,7 +4,7 @@ scriptversion=2014-01-03.01; # UTC
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014, 2016-2017 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.
 
diff --git a/gl/build-aux/inline-source b/gl/build-aux/inline-source
index 3096943..8863244 100755
--- a/gl/build-aux/inline-source
+++ b/gl/build-aux/inline-source
@@ -3,7 +3,7 @@
 # Output the contents of a shell script with sourced files inlined.
 # Written by Gary V. Vaughan, 2012
 
-# Copyright (C) 2012-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014, 2016-2017 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.
 
diff --git a/gl/build-aux/options-parser b/gl/build-aux/options-parser
index 2ba436e..f4d8d40 100644
--- a/gl/build-aux/options-parser
+++ b/gl/build-aux/options-parser
@@ -6,7 +6,7 @@ scriptversion=2014-01-07.03; # UTC
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2014, 2016 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2016-2017 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.
 
diff --git a/gnulib b/gnulib
index 52a5514..e210a3c 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 52a5514ddf33782915338944596be28271285fe5
+Subproject commit e210a3cbaec0ee82a67ff8fc427e21bdd64dba1b
diff --git a/lib/Makefile.am b/lib/Makefile.am
index fac929b..db31f28 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2009-2014, 2016 Free Software Foundation, Inc.
+## Copyright (C) 2009-2014, 2016-2017 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index ede6dbf..d7c6f27 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2016 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/Makefile.am b/src/Makefile.am
index 943d94c..2e335ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2006-2014, 2016 Free Software Foundation, Inc.
+## Copyright (C) 2006-2014, 2016-2017 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##
diff --git a/src/builtin.c b/src/builtin.c
index 302a86a..4eaccc6 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2000, 2004, 2006-2014, 2016 Free Software
-   Foundation, Inc.
+   Copyright (C) 1989-1994, 2000, 2004, 2006-2014, 2016-2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/debug.c b/src/debug.c
index 70a5b80..d1ef1b9 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1991-1994, 2004, 2006-2007, 2009-2014, 2016 Free
+   Copyright (C) 1991-1994, 2004, 2006-2007, 2009-2014, 2016-2017 Free
    Software Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/src/eval.c b/src/eval.c
index 64b389a..64c7624 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2006-2007, 2009-2014, 2016 Free Software
-   Foundation, Inc.
+   Copyright (C) 1989-1994, 2006-2007, 2009-2014, 2016-2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/format.c b/src/format.c
index 608ac72..6bd7301 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2006-2014, 2016 Free Software Foundation,
-   Inc.
+   Copyright (C) 1989-1994, 2006-2014, 2016-2017 Free Software
+   Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/freeze.c b/src/freeze.c
index fd7623d..b0d11d1 100644
--- a/src/freeze.c
+++ b/src/freeze.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2006-2014, 2016 Free Software Foundation,
-   Inc.
+   Copyright (C) 1989-1994, 2006-2014, 2016-2017 Free Software
+   Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/input.c b/src/input.c
index 74891a0..256984c 100644
--- a/src/input.c
+++ b/src/input.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2004-2014, 2016 Free Software Foundation,
-   Inc.
+   Copyright (C) 1989-1994, 2004-2014, 2016-2017 Free Software
+   Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/m4.c b/src/m4.c
index 79946b9..6ae8af5 100644
--- a/src/m4.c
+++ b/src/m4.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2004-2014, 2016 Free Software Foundation,
-   Inc.
+   Copyright (C) 1989-1994, 2004-2014, 2016-2017 Free Software
+   Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/m4.h b/src/m4.h
index 9a13257..c8debc8 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2004-2014, 2016 Free Software Foundation,
-   Inc.
+   Copyright (C) 1989-1994, 2004-2014, 2016-2017 Free Software
+   Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/macro.c b/src/macro.c
index 81218e7..4106396 100644
--- a/src/macro.c
+++ b/src/macro.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2006-2007, 2009-2014, 2016 Free Software
-   Foundation, Inc.
+   Copyright (C) 1989-1994, 2006-2007, 2009-2014, 2016-2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/output.c b/src/output.c
index 9c916d9..a4ad527 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,7 +1,7 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2004-2014, 2016 Free Software Foundation,
-   Inc.
+   Copyright (C) 1989-1994, 2004-2014, 2016-2017 Free Software
+   Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/path.c b/src/path.c
index 88d2c81..a2dd32a 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1993, 2004, 2006-2014, 2016 Free Software
+   Copyright (C) 1989-1993, 2004, 2006-2014, 2016-2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/src/symtab.c b/src/symtab.c
index 26a722f..1d0ebaf 100644
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 2003, 2006-2014, 2016 Free Software
+   Copyright (C) 1989-1994, 2003, 2006-2014, 2016-2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ba5f188..000c44e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2009-2014, 2016 Free Software Foundation, Inc.
+## Copyright (C) 2009-2014, 2016-2017 Free Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
 ##


hooks/post-receive
-- 
GNU M4 source repository


From MAILER-DAEMON Tue Jan 03 17:58:02 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cOY1q-0005QE-Nw
	for mharc-m4-commit@gnu.org; Tue, 03 Jan 2017 17:58:02 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36979)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cOY1j-0005Mv-8Z
	for m4-commit@gnu.org; Tue, 03 Jan 2017 17:58:01 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cOY1c-0000OA-TD
	for m4-commit@gnu.org; Tue, 03 Jan 2017 17:57:55 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:45602)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cOY1c-0000O0-Nh
	for m4-commit@gnu.org; Tue, 03 Jan 2017 17:57:48 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69750)
	id 5A6A02201B8; Tue,  3 Jan 2017 22:57:48 +0000 (UTC)
From: "Eric Blake" <eblake@redhat.com>
To: m4-commit@gnu.org
Subject: [SCM] GNU M4 source repository branch, master,
	updated. cvs-readonly-357-ga6d4737
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d33357e20db8e95e75042ecd02afca8ec5cc3fd7
X-Git-Newrev: a6d4737a42a19cca2400d9f3d2cd035a016dcab4
Message-Id: <20170103225748.5A6A02201B8@vcs.savannah.gnu.org>
Date: Tue,  3 Jan 2017 22:57:48 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: m4-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: git commit notices for  GNU m4 <m4-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/m4-commit/>
List-Post: <mailto:m4-commit@gnu.org>
List-Help: <mailto:m4-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2017 22:58:01 -0000

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=a6d4737a42a19cca2400d9f3d2cd035a016dcab4

The branch, master has been updated
       via  a6d4737a42a19cca2400d9f3d2cd035a016dcab4 (commit)
       via  a71b0a388deedc37a5e3f921d58fcb150c4d54c7 (commit)
       via  6cd5fddbf7ed56bbcd029426ceeefb82931a50db (commit)
       via  83e9a85bc8371b92a74dee8f6ede0cbbc89499dd (commit)
       via  f8822d40ca17af5fdc4703fca2dfc4b01110806e (commit)
       via  8a1c7bd2101f46513d1a9bfba0297baa58acf409 (commit)
       via  b29e28672d50a42f24801e4c742300012474fe07 (commit)
      from  d33357e20db8e95e75042ecd02afca8ec5cc3fd7 (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 a6d4737a42a19cca2400d9f3d2cd035a016dcab4
Author: Eric Blake <eblake@redhat.com>
Date:   Sat Dec 31 15:53:53 2016 -0600

    maint: summarize highlights of 1.4.18 release
    
    * NEWS: Add some blurbs.
    * .prev-version: Record previous version.
    * cfg.mk (old_NEWS_hash): Update.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>
    [this is a mish-mash of two patches from branch-1.4:]
    (cherry picked from commit 658427104bbe515249f728d8524e975167e6533d)
    (cherry picked from commit e0140bd91ce0d2dfcdd1df22472d81ed13489d46)

commit a71b0a388deedc37a5e3f921d58fcb150c4d54c7
Author: Eric Blake <eblake@redhat.com>
Date:   Sat Dec 31 07:35:11 2016 -0600

    maint: make silent builds the default
    
    The user still has full control over verbosity levels, both setting
    their per-project defaults at configure time (or even in a config.site
    file), as well as a per-run override. But these days, most projects
    are defaulting to silent rules without user intervention.
    
    * configure.ac (AM_SILENT_RULES): Add, to match what most projects
    are doing these days.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>
    (cherry picked from commit b4a08ecfd34e703bd846f1e85b4e2a94a34b16d9)
    [For the cherry-pick, all we have to do is normalize the spelling
    of the line - now that we require new-enough automake, it does not
    have to be conditional]

commit 6cd5fddbf7ed56bbcd029426ceeefb82931a50db
Author: Gary V. Vaughan <gary@gnu.org>
Date:   Fri Mar 8 23:03:12 2013 +0700

    maint: automake 1.11.5 and earlier generate insecure dist rules.
    
    * configure.ac (AM_INIT_AUTOMAKE): Require 1.11.6 or newer.
    
    Signed-off-by: Gary V. Vaughan <gary@gnu.org>
    (cherry picked from commit a82e6b74a462b16effb7304b850f72faf727aec5)

commit 83e9a85bc8371b92a74dee8f6ede0cbbc89499dd
Author: Eric Blake <eblake@redhat.com>
Date:   Sat Dec 31 07:26:44 2016 -0600

    maint: release no longer creates a diff file
    
    Ever since commit f1cf390 (1.4.14 release), we no longer create
    diff files as part of the release process.  These days, it is
    assumed that it is easier to download a fresh tarball rather
    than to try and use a diff file to patch an older tarball.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>
    (cherry picked from commit c8a4b7c32db3a6d8d5dc7a9997df2c80ac95b030)

commit f8822d40ca17af5fdc4703fca2dfc4b01110806e
Author: Eric Blake <eblake@redhat.com>
Date:   Fri Dec 30 21:45:16 2016 -0600

    doc: drop obsolete @setcontentsaftertitlepage
    
    texinfo 6.1 complains (during 'make dvi'):
    
    /home/eblake/m4-1.4/doc/./m4.texi:9: @setcontentsaftertitlepage has been remove
    d as a Texinfo command; move your @contents command if you want the contents af
    ter the title page..
    
    It turns out that eliminating the command has no effect - modern
    tools correctly emit the contents in-place, right after the title
    page, so it was leftover cruft from an older time.
    
    * doc/m4.texi: Satisfy newer texinfo.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>
    (cherry picked from commit c7a3591347238aa34defded34609007b326a0984)

commit 8a1c7bd2101f46513d1a9bfba0297baa58acf409
Author: Eric Blake <eblake@redhat.com>
Date:   Tue Jan 3 16:11:39 2017 -0600

    maint: kill trailing spaces
    
    Pointed out during 'make syntax-check'.
    
    * NO-THANKS: Drop trailing spaces.
    * m4/module.c (m4_module_load): Likewise.
    * m4/path.c (m4_path_search): Likewise.
    * po/Makevars (EXTRA_LOCALE_CATEGORIES): Likewise.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

commit b29e28672d50a42f24801e4c742300012474fe07
Author: Eric Blake <eblake@redhat.com>
Date:   Mon Jan 2 07:30:42 2017 -0600

    maint: bump copyright year
    
    Needed to reduce number of 'make syntax-check' failures.
    
    * gnulib: Update to latest.
    * bootstrap.conf (src_modules): Add 'assure', to match gnulib module
    changes in the meantime.
    * .gitignore: Ignore results of assure module.
    * cfg.mk (gnulib_dir): Declare our alternate location.
    * bootstrap: Regenerate.
    * all files: Use 'make update-copyright' to bump year.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>
    (cherry picked from commit 102376916e49b6aae85dc6ff0b59699205a74bdf)
    [Ultimately, this short-circuits all other commits from other branches
    that touched gnulib to any intermediate version]

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

Summary of changes:
 .gitignore                            |    1 +
 .prev-version                         |    2 +-
 AUTHORS                               |    4 ++--
 COPYING                               |    2 +-
 ChangeLog.old                         |    4 ++--
 HACKING                               |   10 +++-------
 Makefile.am                           |    2 +-
 NEWS                                  |   13 +++++++++++--
 NO-THANKS                             |   14 +++++++-------
 README                                |    3 ++-
 README-alpha                          |    3 ++-
 TODO                                  |    2 +-
 bootstrap                             |    8 ++++----
 bootstrap.conf                        |    5 +++--
 build-aux/gl/build-aux/bootstrap.in   |    2 +-
 build-aux/gl/build-aux/extract-trace  |    2 +-
 build-aux/gl/build-aux/funclib.sh     |    2 +-
 build-aux/gl/build-aux/inline-source  |    2 +-
 build-aux/gl/build-aux/options-parser |    2 +-
 build-aux/gnulib                      |    2 +-
 build-aux/m4/debug.m4                 |    2 +-
 build-aux/m4/gmp.m4                   |    2 +-
 build-aux/m4/gnulib-cache.m4          |    4 ++--
 build-aux/m4/m4-error.m4              |    4 ++--
 build-aux/m4/m4-getopt.m4             |    2 +-
 build-aux/m4/m4-gettext.m4            |    4 ++--
 build-aux/m4/m4-obstack.m4            |    4 ++--
 build-aux/m4/m4-regex.m4              |    4 ++--
 build-aux/m4/m4-rename.m4             |    3 ++-
 build-aux/m4/m4-syscmd.m4             |    3 ++-
 build-aux/m4/stackovf.m4              |    4 ++--
 cfg.mk                                |    8 ++++++--
 configure.ac                          |    6 +++---
 doc/Makefile.am                       |    2 +-
 doc/STYLE                             |    3 ++-
 doc/examples/COPYING                  |    2 +-
 doc/examples/WWW/COPYING              |    2 +-
 doc/examples/WWW/m4lib/COPYING        |    2 +-
 doc/examples/modtest.m4               |    3 ++-
 doc/examples/shadow.m4                |    3 ++-
 doc/examples/stdlib.m4                |    3 ++-
 doc/examples/time.m4                  |    3 ++-
 doc/examples/time2.m4                 |    3 ++-
 doc/m4.texi                           |    7 ++-----
 m4/builtin.c                          |    4 ++--
 m4/debug.c                            |    2 +-
 m4/hash.c                             |    4 ++--
 m4/hash.h                             |    2 +-
 m4/input.c                            |    2 +-
 m4/m4.c                               |    4 ++--
 m4/m4module.h                         |    2 +-
 m4/m4private.h                        |    2 +-
 m4/macro.c                            |    4 ++--
 m4/module.c                           |    6 +++---
 m4/output.c                           |    4 ++--
 m4/path.c                             |    4 ++--
 m4/resyntax.c                         |    4 ++--
 m4/symtab.c                           |    2 +-
 m4/syntax.c                           |    2 +-
 m4/system_.h                          |    2 +-
 m4/utility.c                          |    4 ++--
 modules/README                        |    4 ++--
 modules/evalparse.c                   |    4 ++--
 modules/format.c                      |    4 ++--
 modules/gnu.c                         |    4 ++--
 modules/m4.c                          |    4 ++--
 modules/m4.h                          |    2 +-
 modules/mpeval.c                      |    4 ++--
 modules/stdlib.c                      |    2 +-
 modules/time.c                        |    2 +-
 modules/traditional.c                 |    2 +-
 po/Makevars                           |    2 +-
 src/freeze.c                          |    2 +-
 src/m4.h                              |    4 ++--
 src/main.c                            |    2 +-
 src/stackovf.c                        |    4 ++--
 tests/atlocal.in                      |    4 ++--
 tests/builtins.at                     |    4 ++--
 tests/freeze.at                       |    3 ++-
 tests/generate.awk                    |    4 ++--
 tests/import.c                        |    2 +-
 tests/iso8859.m4                      |  Bin 1459 -> 1465 bytes
 tests/m4.in                           |    4 ++--
 tests/macros.at                       |    2 +-
 tests/modtest.c                       |    4 ++--
 tests/modules.at                      |    2 +-
 tests/options.at                      |    4 ++--
 tests/others.at                       |    4 ++--
 tests/shadow.c                        |    4 ++--
 tests/stackovf.test                   |    2 +-
 tests/testsuite.at                    |    4 ++--
 91 files changed, 167 insertions(+), 148 deletions(-)

diff --git a/.gitignore b/.gitignore
index b196d98..e0841d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,7 @@ Makefile.inc
 /po/POTFILES
 /po/Rules-quot
 /po/stamp-po
+/src/assure*
 /src/getopt*
 /src/m4
 /src/version-etc*
diff --git a/.prev-version b/.prev-version
index 323afbc..f689e8c 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-1.4.14
+1.4.18
diff --git a/AUTHORS b/AUTHORS
index 45181e4..73ce2f9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,8 +32,8 @@ Tim Rice                    tim@multitalents.net          2011-01-24
 
 ========================================================================
 
-Copyright (C) 2000, 2006-2007, 2010, 2013-2014 Free Software Foundation,
-Inc.
+Copyright (C) 2000, 2006-2007, 2010, 2013-2014, 2017 Free Software
+Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/COPYING b/COPYING
index 170a3ea..a9e5a4c 100644
--- a/COPYING
+++ b/COPYING
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007, 2013-2014 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007, 2013-2014, 2017 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
diff --git a/ChangeLog.old b/ChangeLog.old
index 6e311d4..ab146a8 100644
--- a/ChangeLog.old
+++ b/ChangeLog.old
@@ -12316,8 +12316,8 @@
 	coding: utf-8
 	End:
 
-	Copyright (C) 1990-1994, 2000-2001, 2003, 2005-2010, 2013-2014
-	Free Software Foundation, Inc.
+	Copyright (C) 1990-1994, 2000-2001, 2003, 2005-2010, 2013-2014,
+	2017 Free Software Foundation, Inc.
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/HACKING b/HACKING
index 7dbd683..83990e1 100644
--- a/HACKING
+++ b/HACKING
@@ -277,9 +277,6 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
 
 * Make sure you have rsync installed.
 
-* Make sure you have a copy of the previous release tarball in the build
-  directory.
-
 * Make sure you have GNU make installed.
 
 * Make sure you have an up-to-date version of help2man installed.
@@ -317,9 +314,8 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
 * Run `make distcheck'.  If there are any problems, fix them, then run
   `git tag -d v<version>' and start again from the `git commit' step.
 
-* Run `make <target>', with target set to `stable, `alpha', or `beta' as
-  appropriate.  This will run various additional checks and create diff
-  files from the previous version.
+* Run `make <target>', with target set to `stable', `alpha', or `beta'
+  as appropriate.  This will run various additional checks.
 
 * Run './build-aux/gnupload --to [dest].gnu.org:m4 [files]' to create
   detached gpg signature and clear signed directive files, and upload
@@ -359,7 +355,7 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
   that needs to be updated.
 
 -----------
-Copyright (C) 2004-2010, 2013-2014 Free Software Foundation, Inc.
+Copyright (C) 2004-2010, 2013-2014, 2017 Free Software Foundation, Inc.
 
 The canonical source of this file is maintained with the
 GNU M4 package.  Report bugs to bug-m4@gnu.org.
diff --git a/Makefile.am b/Makefile.am
index 86561a8..1f38595 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2000-2001, 2003-2010, 2013-2014 Free Software
+## Copyright (C) 2000-2001, 2003-2010, 2013-2014, 2017 Free Software
 ## Foundation, Inc.
 ##
 ## This file is part of GNU M4.
diff --git a/NEWS b/NEWS
index 4277e9d..8c9b986 100644
--- a/NEWS
+++ b/NEWS
@@ -323,6 +323,15 @@ promoted to 2.0.
 
 ** A number of portability improvements inherited from gnulib.
 
+* Noteworthy changes in release 1.4.18 (2016-12-31) [stable]
+
+** Diagnose --word-regexp as unsupported if it was not configured.
+
+** Preliminary support for OS/2.
+
+** A number of portability improvements inherited from gnulib.
+
+
 * Noteworthy changes in release 1.4.17 (2013-09-17) [stable]
 
 ** Fix compilation with newer glibc headers.
@@ -1208,8 +1217,8 @@ Local Variables:
 fill-column: 75
 End:
 
-Copyright (C) 1992-1994, 2004-2011, 2013-2014 Free Software Foundation,
-Inc.
+Copyright (C) 1992-1994, 2004-2011, 2013-2014, 2017 Free Software
+Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/NO-THANKS b/NO-THANKS
index 0c58ac1..87d631e 100644
--- a/NO-THANKS
+++ b/NO-THANKS
@@ -4,14 +4,14 @@ The particular contributions are described in the version control logs and
 ChangeLog files.  If your name has been left out, if you'd rather not be
 listed, or if you'd prefer a different address be used, please send a
 note to the bug-report mailing list (as seen at end of e.g., m4 --help).
-## 
+##
 ## There is no need to list here any name that appears as an Author in
 ## "git log" output.  Those are automatically added when this template
 ## is used to generate the THANKS file. You will still need to add
 ## contributors who are not a git log Author - e.g. bug reporters.
-## 
+##
 ## Folks already promoted to AUTHORS:
-## 
+##
 !Akim Demaille
 !Alexandre Duret-Lutz
 !Andrew James Bettison
@@ -35,20 +35,20 @@ note to the bug-report mailing list (as seen at end of e.g., m4 --help).
 !Tim Rice
 !William C. Cox
 !Yuji Minejima
-## 
+##
 ## Remove duplicates under alternate names, and add preferred email
 ## addresses from contributors that don't match git log output here:
-## 
+##
 !Andrew Bettison
 !Eric Blake
 !Francois Pinard
 !Noah Misch
 !Rene' Seindal
-## 
+##
 ## Add bug reporters, patch Authors you forgot to attribute at commit
 ## time with 'git commit --author=...' and other non-patch contributers
 ## below:
-## 
+##
 Akiko Matsushita		matusita@sra.co.jp
 Alan Magnuson			awm@osc.edu
 Albert Chin			m4-discuss@mlists.thewrittenword.com
diff --git a/README b/README
index d875011..69255a2 100644
--- a/README
+++ b/README
@@ -93,7 +93,8 @@ note that the range specifies every single year in that closed interval.
 
 ========================================================================
 
-Copyright (C) 2000, 2005-2011, 2013-2014 Free Software Foundation, Inc.
+Copyright (C) 2000, 2005-2011, 2013-2014, 2017 Free Software Foundation,
+Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/README-alpha b/README-alpha
index d54e743..bf4aa21 100644
--- a/README-alpha
+++ b/README-alpha
@@ -13,7 +13,8 @@ GNU m4 has a web-site at http://www.gnu.org/software/m4/
 
 ========================================================================
 
-Copyright (C) 2000, 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+Copyright (C) 2000, 2006, 2010, 2013-2014, 2017 Free Software
+Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/TODO b/TODO
index b9fb88b..9833f03 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
 GNU m4 TODO - Tasks that need implementing.      -*- outline -*-
-Copyright (C) 2000-2001, 2006-2008, 2010, 2013-2014 Free Software
+Copyright (C) 2000-2001, 2006-2008, 2010, 2013-2014, 2017 Free Software
 Foundation, Inc.
 
 Tell the maintainers at <bug-m4@gnu.org> if you feel like volunteering
diff --git a/bootstrap b/bootstrap
index f81f3ff..8984cfd 100755
--- a/bootstrap
+++ b/bootstrap
@@ -5,7 +5,7 @@
 # Bootstrap an Autotooled package from checked-out sources.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2017 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.
 
@@ -235,7 +235,7 @@ scriptversion=2014-01-03.01; # UTC
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014, 2017 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.
 
@@ -1541,7 +1541,7 @@ scriptversion=2014-01-07.03; # UTC
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2017 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.
 
@@ -2146,7 +2146,7 @@ func_version ()
 # Extract macro arguments from autotools input with GNU M4.
 # Written by Gary V. Vaughan, 2010
 #
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2017 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.
 
diff --git a/bootstrap.conf b/bootstrap.conf
index b48b650..b232634 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,7 +1,7 @@
-# bootstrap.conf (GNU M4) version 2010-09-10
+# bootstrap.conf (GNU M4) version 2017-01-03
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010, 2013-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010, 2013-2014, 2017 Free Software Foundation, Inc.
 
 # This file is part of GNU M4.
 #
@@ -59,6 +59,7 @@ gnulib_non_module_files=$gnulib_non_module_files"
 # List dependencies here too; we don't extract them, otherwise dependent
 # modules could end up being imported to src/ *and* gnu/!
 src_modules='
+assure
 getopt-gnu
 getopt-posix
 version-etc-fsf
diff --git a/build-aux/gl/build-aux/bootstrap.in b/build-aux/gl/build-aux/bootstrap.in
index 05025ff..4cc7362 100755
--- a/build-aux/gl/build-aux/bootstrap.in
+++ b/build-aux/gl/build-aux/bootstrap.in
@@ -3,7 +3,7 @@
 # Bootstrap an Autotooled package from checked-out sources.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2017 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.
 
diff --git a/build-aux/gl/build-aux/extract-trace b/build-aux/gl/build-aux/extract-trace
index 41a7b8b..d0d83fe 100755
--- a/build-aux/gl/build-aux/extract-trace
+++ b/build-aux/gl/build-aux/extract-trace
@@ -3,7 +3,7 @@
 # Extract macro arguments from autotools input with GNU M4.
 # Written by Gary V. Vaughan, 2010
 #
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2017 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.
 
diff --git a/build-aux/gl/build-aux/funclib.sh b/build-aux/gl/build-aux/funclib.sh
index 9cb02ff..fbe8b67 100644
--- a/build-aux/gl/build-aux/funclib.sh
+++ b/build-aux/gl/build-aux/funclib.sh
@@ -4,7 +4,7 @@ scriptversion=2014-01-03.01; # UTC
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014, 2017 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.
 
diff --git a/build-aux/gl/build-aux/inline-source b/build-aux/gl/build-aux/inline-source
index fede037..0e4da9c 100755
--- a/build-aux/gl/build-aux/inline-source
+++ b/build-aux/gl/build-aux/inline-source
@@ -3,7 +3,7 @@
 # Output the contents of a shell script with sourced files inlined.
 # Written by Gary V. Vaughan, 2012
 
-# Copyright (C) 2012-2014 Free Software Foundation, Inc.
+# Copyright (C) 2012-2014, 2017 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.
 
diff --git a/build-aux/gl/build-aux/options-parser b/build-aux/gl/build-aux/options-parser
index 41302a8..dd9867f 100644
--- a/build-aux/gl/build-aux/options-parser
+++ b/build-aux/gl/build-aux/options-parser
@@ -6,7 +6,7 @@ scriptversion=2014-01-07.03; # UTC
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
 
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014, 2017 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.
 
diff --git a/build-aux/gnulib b/build-aux/gnulib
index 79002fd..31bc499 160000
--- a/build-aux/gnulib
+++ b/build-aux/gnulib
@@ -1 +1 @@
-Subproject commit 79002fdd9f556694728f5ebc2ea0c43c14ef476d
+Subproject commit 31bc499696c19bb64741e56c8cd13e1a2ead87c2
diff --git a/build-aux/m4/debug.m4 b/build-aux/m4/debug.m4
index 38f4fc6..ec45e2d 100644
--- a/build-aux/m4/debug.m4
+++ b/build-aux/m4/debug.m4
@@ -1,7 +1,7 @@
 ##                                                           -*- Autoconf -*-
 ## debug.m4 -- massage compiler flags for debugging/optimisation
 ##
-## Copyright (C) 2000-2001, 2003, 2005-2007, 2010, 2013-2014 Free
+## Copyright (C) 2000-2001, 2003, 2005-2007, 2010, 2013-2014, 2017 Free
 ## Software Foundation, Inc.
 ## Copyright (C) 1999-2000 Ralf S. Engelschall
 ## Written by <rse@engelschall.com>
diff --git a/build-aux/m4/gmp.m4 b/build-aux/m4/gmp.m4
index ad9640d..0e60bdc 100644
--- a/build-aux/m4/gmp.m4
+++ b/build-aux/m4/gmp.m4
@@ -1,5 +1,5 @@
 ## -*- Autoconf -*-
-## Copyright (C) 2000-2001, 2003, 2006-2008, 2010, 2013-2014 Free
+## Copyright (C) 2000-2001, 2003, 2006-2008, 2010, 2013-2014, 2017 Free
 ## Software Foundation, Inc.
 ##
 ## This file is part of GNU M4.
diff --git a/build-aux/m4/gnulib-cache.m4 b/build-aux/m4/gnulib-cache.m4
index 145b3da..667d2ff 100644
--- a/build-aux/m4/gnulib-cache.m4
+++ b/build-aux/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=build-aux/gl --lib=libgnu --source-base=m4/gnu --m4-base=build-aux/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix
+#   gnulib-tool --import --local-dir=build-aux/gl --lib=libgnu --source-base=m4/gnu --m4-base=build-aux/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --with-c++-tests --no-conditional-dependencies --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute fclose fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gitlog-to-changelog gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile manywarnings memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix progname propername quote regex regexprops-generic rename setenv sigpipe snprintf-posix spawn-pipe sprintf-posix stdbool stdlib-safer strnlen strtod tempname unlocked-io unsetenv update-copyright vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([build-aux/gl])
diff --git a/build-aux/m4/m4-error.m4 b/build-aux/m4/m4-error.m4
index 90f61e2..ba9907c 100644
--- a/build-aux/m4/m4-error.m4
+++ b/build-aux/m4/m4-error.m4
@@ -2,8 +2,8 @@
 # m4-error.m4 -- Use the installed version of error.h if available.
 # Written by Gary V. Vaughan <gary@gnu.org>
 #
-# Copyright (C) 2003-2004, 2006-2007, 2010, 2013-2014 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2004, 2006-2007, 2010, 2013-2014, 2017 Free
+# Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/build-aux/m4/m4-getopt.m4 b/build-aux/m4/m4-getopt.m4
index a318fc4..2799e38 100644
--- a/build-aux/m4/m4-getopt.m4
+++ b/build-aux/m4/m4-getopt.m4
@@ -2,7 +2,7 @@
 # m4-getopt.m4 -- Use the installed version of getopt.h if available.
 # Written by Gary V. Vaughan <gary@gnu.org>
 #
-# Copyright (C) 2005-2007, 2009-2010, 2013-2014 Free Software
+# Copyright (C) 2005-2007, 2009-2010, 2013-2014, 2017 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU M4.
diff --git a/build-aux/m4/m4-gettext.m4 b/build-aux/m4/m4-gettext.m4
index 01d1347..65c1299 100644
--- a/build-aux/m4/m4-gettext.m4
+++ b/build-aux/m4/m4-gettext.m4
@@ -2,8 +2,8 @@
 # m4-gettext.m4 -- Use the installed version of GNU gettext if available.
 # Written by Gary V. Vaughan <gary@gnu.org>
 #
-# Copyright (C) 2003-2004, 2006-2007, 2010, 2013-2014 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2004, 2006-2007, 2010, 2013-2014, 2017 Free
+# Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/build-aux/m4/m4-obstack.m4 b/build-aux/m4/m4-obstack.m4
index 67bed34..db31b01 100644
--- a/build-aux/m4/m4-obstack.m4
+++ b/build-aux/m4/m4-obstack.m4
@@ -1,8 +1,8 @@
 #                                                            -*- Autoconf -*-
 # m4-obstack.m4 -- the libc supplied version of obstacks if available.
 #
-# Copyright (C) 2000-2001, 2003-2004, 2006-2007, 2010, 2013-2014 Free
-# Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2004, 2006-2007, 2010, 2013-2014, 2017
+# Free Software Foundation, Inc.
 # Written by Gary V. Vaughan <gary@gnu.org>
 #
 # This file is part of GNU M4.
diff --git a/build-aux/m4/m4-regex.m4 b/build-aux/m4/m4-regex.m4
index 9d04807..c1e8acd 100644
--- a/build-aux/m4/m4-regex.m4
+++ b/build-aux/m4/m4-regex.m4
@@ -2,8 +2,8 @@
 # m4-regex.m4 -- Use the installed regex if it is good enough.
 # Written by Gary V. Vaughan <gary@gnu.org>
 #
-# Copyright (C) 2003-2004, 2006-2007, 2010, 2013-2014 Free Software
-# Foundation, Inc.
+# Copyright (C) 2003-2004, 2006-2007, 2010, 2013-2014, 2017 Free
+# Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/build-aux/m4/m4-rename.m4 b/build-aux/m4/m4-rename.m4
index 7fc36ad..faafd1b 100644
--- a/build-aux/m4/m4-rename.m4
+++ b/build-aux/m4/m4-rename.m4
@@ -2,7 +2,8 @@
 # m4-rename.m4 -- Test the abilities of rename.
 # Written by Eric Blake <ebb9@byu.net>
 #
-# Copyright (C) 2008, 2010, 2013-2014 Free Software Foundation, Inc.
+# Copyright (C) 2008, 2010, 2013-2014, 2017 Free Software Foundation,
+# Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/build-aux/m4/m4-syscmd.m4 b/build-aux/m4/m4-syscmd.m4
index 3e2edd1..2b4beb5 100644
--- a/build-aux/m4/m4-syscmd.m4
+++ b/build-aux/m4/m4-syscmd.m4
@@ -2,7 +2,8 @@
 # m4-syscmd.m4 -- Allow choice of syscmd shell.
 # Written by Eric Blake <ebb9@byu.net>
 #
-# Copyright (C) 2009-2010, 2013-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2010, 2013-2014, 2017 Free Software Foundation,
+# Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/build-aux/m4/stackovf.m4 b/build-aux/m4/stackovf.m4
index d94e4db..104f737 100644
--- a/build-aux/m4/stackovf.m4
+++ b/build-aux/m4/stackovf.m4
@@ -1,8 +1,8 @@
 #                                                            -*- Autoconf -*-
 # stackovf.m4 -- how do we deal with stack overflow?
 #
-# Copyright (C) 2000, 2003, 2006-2007, 2010, 2013-2014 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000, 2003, 2006-2007, 2010, 2013-2014, 2017 Free
+# Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/cfg.mk b/cfg.mk
index 2ccdd50..3b5c6f1 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,6 @@
 # Customize maint.mk.                           -*- makefile -*-
-# Copyright (C) 2003-2011, 2013-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2011, 2013-2014, 2017 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
@@ -14,6 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+# We intentionally hide the submodule in a subdirectory
+gnulib_dir = $(srcdir)/build-aux/gnulib
+
 # Used in maint.mk's web-manual rule
 manual_title = GNU macro processor
 
@@ -36,7 +40,7 @@ local-checks-to-skip = sc_cast_of_x_alloc_return_value \
 _makefile_at_at_check_exceptions = ' && !/PRAGMA_SYSTEM_HEADER/'
 
 # Hash of NEWS contents, to ensure we don't add entries to wrong section.
-old_NEWS_hash = bbccada98ce08092a9f24b508c399051
+old_NEWS_hash = 761ae30101b24be4aea2f564e9ceee75
 
 # Indent only with spaces.
 sc_prohibit_tab_based_indentation:
diff --git a/configure.ac b/configure.ac
index 342aecf..c4644af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # Configure template for GNU m4.           -*-Autoconf-*-
-# Copyright (C) 1991-1994, 2000-2002, 2004-2014 Free Software
+# Copyright (C) 1991-1994, 2000-2002, 2004-2014, 2017 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU M4.
@@ -54,10 +54,10 @@ M4_default_preload="M4_DEFAULT_PRELOAD"
 ## ------------------------ ##
 ## Automake Initialization. ##
 ## ------------------------ ##
-AM_INIT_AUTOMAKE([1.10b subdir-objects dist-bzip2 dist-xz
+AM_INIT_AUTOMAKE([1.11.6 subdir-objects dist-bzip2 dist-xz
 color-tests parallel-tests silent-rules]
 m4_if(m4_index(m4_defn([M4_VERSION]), [-]), [-1], [gnits], [gnu]))
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_SILENT_RULES([yes]) # make --enable-silent-rules the default.
 
 
 ## ------------------ ##
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 13d8539..59648e5 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am - template for generating Makefile via Automake
 ##
-## Copyright (C) 2000-2001, 2003-2010, 2013-2014 Free Software
+## Copyright (C) 2000-2001, 2003-2010, 2013-2014, 2017 Free Software
 ## Foundation, Inc.
 ##
 ## This file is part of GNU M4.
diff --git a/doc/STYLE b/doc/STYLE
index 49f8933..6b10644 100644
--- a/doc/STYLE
+++ b/doc/STYLE
@@ -89,7 +89,8 @@ following restrictions on coding style apply:
 
 ========================================================================
 
-Copyright (C) 2003, 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+Copyright (C) 2003, 2006, 2010, 2013-2014, 2017 Free Software
+Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/doc/examples/COPYING b/doc/examples/COPYING
index 328ccb3..e0170d7 100644
--- a/doc/examples/COPYING
+++ b/doc/examples/COPYING
@@ -2,7 +2,7 @@ The files in this directory provide example uses of GNU M4.
 The following copyright notice applies to each of these
 description files.
 
-Copyright (C) 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+Copyright (C) 2006, 2010, 2013-2014, 2017 Free Software Foundation, Inc.
 This file is free software; the Free Software Foundation
 gives unlimited permission to copy and/or distribute it,
 with or without modifications, as long as this notice is preserved.
diff --git a/doc/examples/WWW/COPYING b/doc/examples/WWW/COPYING
index 328ccb3..e0170d7 100644
--- a/doc/examples/WWW/COPYING
+++ b/doc/examples/WWW/COPYING
@@ -2,7 +2,7 @@ The files in this directory provide example uses of GNU M4.
 The following copyright notice applies to each of these
 description files.
 
-Copyright (C) 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+Copyright (C) 2006, 2010, 2013-2014, 2017 Free Software Foundation, Inc.
 This file is free software; the Free Software Foundation
 gives unlimited permission to copy and/or distribute it,
 with or without modifications, as long as this notice is preserved.
diff --git a/doc/examples/WWW/m4lib/COPYING b/doc/examples/WWW/m4lib/COPYING
index 328ccb3..e0170d7 100644
--- a/doc/examples/WWW/m4lib/COPYING
+++ b/doc/examples/WWW/m4lib/COPYING
@@ -2,7 +2,7 @@ The files in this directory provide example uses of GNU M4.
 The following copyright notice applies to each of these
 description files.
 
-Copyright (C) 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+Copyright (C) 2006, 2010, 2013-2014, 2017 Free Software Foundation, Inc.
 This file is free software; the Free Software Foundation
 gives unlimited permission to copy and/or distribute it,
 with or without modifications, as long as this notice is preserved.
diff --git a/doc/examples/modtest.m4 b/doc/examples/modtest.m4
index b4d01c3..17e6b02 100644
--- a/doc/examples/modtest.m4
+++ b/doc/examples/modtest.m4
@@ -1,4 +1,5 @@
-dnl Copyright (C) 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013-2014, 2017 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/doc/examples/shadow.m4 b/doc/examples/shadow.m4
index ca33de2..d82b844 100644
--- a/doc/examples/shadow.m4
+++ b/doc/examples/shadow.m4
@@ -1,4 +1,5 @@
-dnl Copyright (C) 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013-2014, 2017 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/doc/examples/stdlib.m4 b/doc/examples/stdlib.m4
index 2e25864..14df457 100644
--- a/doc/examples/stdlib.m4
+++ b/doc/examples/stdlib.m4
@@ -1,4 +1,5 @@
-dnl Copyright (C) 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013-2014, 2017 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/doc/examples/time.m4 b/doc/examples/time.m4
index 7cef47c..ae93104 100644
--- a/doc/examples/time.m4
+++ b/doc/examples/time.m4
@@ -1,4 +1,5 @@
-dnl Copyright (C) 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013-2014, 2017 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/doc/examples/time2.m4 b/doc/examples/time2.m4
index 021cb23..36840c4 100644
--- a/doc/examples/time2.m4
+++ b/doc/examples/time2.m4
@@ -1,4 +1,5 @@
-dnl Copyright (C) 2006, 2010, 2013-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2010, 2013-2014, 2017 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/doc/m4.texi b/doc/m4.texi
index ba1b157..5108e20 100644
--- a/doc/m4.texi
+++ b/doc/m4.texi
@@ -5,9 +5,6 @@
 @include version.texi
 @settitle GNU M4 @value{VERSION} macro processor
 @setchapternewpage odd
-@ifnothtml
-@setcontentsaftertitlepage
-@end ifnothtml
 @finalout
 
 @set beta
@@ -45,8 +42,8 @@ This manual (@value{UPDATED}) is for GNU M4 (version
 @value{VERSION}), a package containing an implementation of the m4 macro
 language.
 
-Copyright @copyright{} 1989-1994, 2004-2011, 2013-2014 Free Software
-Foundation, Inc.
+Copyright @copyright{} 1989-1994, 2004-2011, 2013-2014, 2017 Free
+Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/m4/builtin.c b/m4/builtin.c
index ee2f5c9..19db087 100644
--- a/m4/builtin.c
+++ b/m4/builtin.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 1999-2000, 2005-2008, 2010, 2013-2014 Free
-   Software Foundation, Inc.
+   Copyright (C) 1989-1994, 1999-2000, 2005-2008, 2010, 2013-2014, 2017
+   Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/m4/debug.c b/m4/debug.c
index 0eeece5..eb0e32f 100644
--- a/m4/debug.c
+++ b/m4/debug.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1991-1994, 2006-2010, 2013-2014 Free Software
+   Copyright (C) 1991-1994, 2006-2010, 2013-2014, 2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/m4/hash.c b/m4/hash.c
index 41577c9..01b9064 100644
--- a/m4/hash.c
+++ b/m4/hash.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2001, 2006-2010, 2013-2014 Free Software Foundation,
-   Inc.
+   Copyright (C) 2001, 2006-2010, 2013-2014, 2017 Free Software
+   Foundation, Inc.
    Written by Gary V. Vaughan <gary@gnu.org>
 
    This file is part of GNU M4.
diff --git a/m4/hash.h b/m4/hash.h
index 58341c2..46f0eee 100644
--- a/m4/hash.h
+++ b/m4/hash.h
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2001, 2006-2007, 2010, 2013-2014 Free Software
+   Copyright (C) 2001, 2006-2007, 2010, 2013-2014, 2017 Free Software
    Foundation, Inc.
    Written by Gary V. Vaughan <gary@gnu.org>
 
diff --git a/m4/input.c b/m4/input.c
index 1c830ba..edce12e 100644
--- a/m4/input.c
+++ b/m4/input.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 2006-2010, 2013-2014 Free Software
+   Copyright (C) 1989-1994, 2006-2010, 2013-2014, 2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/m4/m4.c b/m4/m4.c
index 216a0fd..0bf185c 100644
--- a/m4/m4.c
+++ b/m4/m4.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 2001, 2004, 2006-2008, 2010, 2013-2014 Free
-   Software Foundation, Inc.
+   Copyright (C) 1989-1994, 2001, 2004, 2006-2008, 2010, 2013-2014, 2017
+   Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/m4/m4module.h b/m4/m4module.h
index 463ed5c..a96b985 100644
--- a/m4/m4module.h
+++ b/m4/m4module.h
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 1999-2000, 2003-2010, 2013-2014 Free
+   Copyright (C) 1989-1994, 1999-2000, 2003-2010, 2013-2014, 2017 Free
    Software Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/m4/m4private.h b/m4/m4private.h
index 3212906..a09ca9f 100644
--- a/m4/m4private.h
+++ b/m4/m4private.h
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 1998-1999, 2004-2010, 2013-2014 Free
+   Copyright (C) 1989-1994, 1998-1999, 2004-2010, 2013-2014, 2017 Free
    Software Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/m4/macro.c b/m4/macro.c
index 01f5f0f..ce2675b 100644
--- a/m4/macro.c
+++ b/m4/macro.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 2001, 2006-2010, 2013-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1989-1994, 2001, 2006-2010, 2013-2014, 2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/m4/module.c b/m4/module.c
index 563cf44..c00b8aa 100644
--- a/m4/module.c
+++ b/m4/module.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 1998-1999, 2002-2008, 2010, 2013-2014 Free
-   Software Foundation, Inc.
+   Copyright (C) 1989-1994, 1998-1999, 2002-2008, 2010, 2013-2014, 2017
+   Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
@@ -226,7 +226,7 @@ m4_module *
 m4_module_load (m4 *context, const char *name, m4_obstack *obs)
 {
   m4_module *module = m4__module_find (context, name);
-  
+
   if (!module)
     {
       module = m4__module_open (context, name, obs);
diff --git a/m4/output.c b/m4/output.c
index bf3c599..b937195 100644
--- a/m4/output.c
+++ b/m4/output.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 1998, 2002, 2004, 2006-2010, 2013-2014 Free
-   Software Foundation, Inc.
+   Copyright (C) 1989-1994, 1998, 2002, 2004, 2006-2010, 2013-2014, 2017
+   Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/m4/path.c b/m4/path.c
index ef743a3..0c6a962 100644
--- a/m4/path.c
+++ b/m4/path.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1993, 1998, 2004, 2006-2010, 2013-2014 Free
+   Copyright (C) 1989-1993, 1998, 2004, 2006-2010, 2013-2014, 2017 Free
    Software Foundation, Inc.
 
    This file is part of GNU M4.
@@ -275,7 +275,7 @@ m4_path_search (m4 *context, const char *filename, const char **suffixes)
       filepath = path_truncate (filepath);
       mem = strlen (filepath); /* recalculate length after truncation */
 #endif
- 
+
       for (i = 0; suffixes && suffixes[i]; ++i)
         {
           strcpy (filepath + mem, suffixes[i]);
diff --git a/m4/resyntax.c b/m4/resyntax.c
index 9ab66a9..704e357 100644
--- a/m4/resyntax.c
+++ b/m4/resyntax.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2006-2008, 2010, 2013-2014 Free Software Foundation,
-   Inc.
+   Copyright (C) 2006-2008, 2010, 2013-2014, 2017 Free Software
+   Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/m4/symtab.c b/m4/symtab.c
index 5a8833f..b04b55e 100644
--- a/m4/symtab.c
+++ b/m4/symtab.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 2001, 2005-2008, 2010, 2013-2014 Free
+   Copyright (C) 1989-1994, 2001, 2005-2008, 2010, 2013-2014, 2017 Free
    Software Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/m4/syntax.c b/m4/syntax.c
index 8d31e44..4bde123 100644
--- a/m4/syntax.c
+++ b/m4/syntax.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 2002, 2004, 2006-2010, 2013-2014 Free
+   Copyright (C) 1989-1994, 2002, 2004, 2006-2010, 2013-2014, 2017 Free
    Software Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/m4/system_.h b/m4/system_.h
index 340c987..7176b38 100644
--- a/m4/system_.h
+++ b/m4/system_.h
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2000-2001, 2003, 2006-2008, 2010, 2013-2014 Free
+   Copyright (C) 2000-2001, 2003, 2006-2008, 2010, 2013-2014, 2017 Free
    Software Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/m4/utility.c b/m4/utility.c
index 7434fc6..2063c6a 100644
--- a/m4/utility.c
+++ b/m4/utility.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 1998-1999, 2003, 2006-2010, 2013-2014 Free
-   Software Foundation, Inc.
+   Copyright (C) 1989-1994, 1998-1999, 2003, 2006-2010, 2013-2014, 2017
+   Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/modules/README b/modules/README
index f2f4851..b8f8169 100644
--- a/modules/README
+++ b/modules/README
@@ -79,8 +79,8 @@ or in the case of time2.m4
 
 ========================================================================
 
-Copyright (C) 2000-2001, 2006, 2010, 2013-2014 Free Software Foundation,
-Inc.
+Copyright (C) 2000-2001, 2006, 2010, 2013-2014, 2017 Free Software
+Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/modules/evalparse.c b/modules/evalparse.c
index b3989f3..d70d606 100644
--- a/modules/evalparse.c
+++ b/modules/evalparse.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 2001, 2006-2010, 2013-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1989-1994, 2001, 2006-2010, 2013-2014, 2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/modules/format.c b/modules/format.c
index 2154f4d..2c87fcc 100644
--- a/modules/format.c
+++ b/modules/format.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 2001, 2006-2010, 2013-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1989-1994, 2001, 2006-2010, 2013-2014, 2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/modules/gnu.c b/modules/gnu.c
index 994b368..334ab67 100644
--- a/modules/gnu.c
+++ b/modules/gnu.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2000, 2004-2010, 2013-2014 Free Software Foundation,
-   Inc.
+   Copyright (C) 2000, 2004-2010, 2013-2014, 2017 Free Software
+   Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/modules/m4.c b/modules/m4.c
index ee97349..ed06942 100644
--- a/modules/m4.c
+++ b/modules/m4.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2000, 2002-2004, 2006-2010, 2013-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000, 2002-2004, 2006-2010, 2013-2014, 2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/modules/m4.h b/modules/m4.h
index 4e1a975..769665e 100644
--- a/modules/m4.h
+++ b/modules/m4.h
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2003, 2006-2008, 2010, 2013-2014 Free Software
+   Copyright (C) 2003, 2006-2008, 2010, 2013-2014, 2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/modules/mpeval.c b/modules/mpeval.c
index 6254416..1c998b6 100644
--- a/modules/mpeval.c
+++ b/modules/mpeval.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2000-2001, 2006-2008, 2010, 2013-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 2000-2001, 2006-2008, 2010, 2013-2014, 2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/modules/stdlib.c b/modules/stdlib.c
index 163bdca..708f8c6 100644
--- a/modules/stdlib.c
+++ b/modules/stdlib.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1999-2001, 2006-2010, 2013-2014 Free Software
+   Copyright (C) 1999-2001, 2006-2010, 2013-2014, 2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/modules/time.c b/modules/time.c
index 03ce399..7f64f92 100644
--- a/modules/time.c
+++ b/modules/time.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1999-2001, 2006-2010, 2013-2014 Free Software
+   Copyright (C) 1999-2001, 2006-2010, 2013-2014, 2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/modules/traditional.c b/modules/traditional.c
index 845bd6e..648cef7 100644
--- a/modules/traditional.c
+++ b/modules/traditional.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2000, 2006-2008, 2010, 2013-2014 Free Software
+   Copyright (C) 2000, 2006-2008, 2010, 2013-2014, 2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/po/Makevars b/po/Makevars
index 6f3cd63..f1bf150 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -41,4 +41,4 @@ MSGID_BUGS_ADDRESS = bug-m4@gnu.org
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES = 
+EXTRA_LOCALE_CATEGORIES =
diff --git a/src/freeze.c b/src/freeze.c
index 8298317..426e34b 100644
--- a/src/freeze.c
+++ b/src/freeze.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 2004-2010, 2013-2014 Free Software
+   Copyright (C) 1989-1994, 2004-2010, 2013-2014, 2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/src/m4.h b/src/m4.h
index 714c488..acd8fa9 100644
--- a/src/m4.h
+++ b/src/m4.h
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1989-1994, 2006-2007, 2010, 2013-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1989-1994, 2006-2007, 2010, 2013-2014, 2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/src/main.c b/src/main.c
index d8adabc..4b897e3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
 
-   Copyright (C) 1989-1994, 1999-2000, 2003-2010, 2013-2014 Free
+   Copyright (C) 1989-1994, 1999-2000, 2003-2010, 2013-2014, 2017 Free
    Software Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/src/stackovf.c b/src/stackovf.c
index 4810019..3d0468a 100644
--- a/src/stackovf.c
+++ b/src/stackovf.c
@@ -1,6 +1,6 @@
 /* Detect stack overflow (when getrlimit and sigaction or sigvec are available)
-   Copyright (C) 1993-1994, 2006-2007, 2010, 2013-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1993-1994, 2006-2007, 2010, 2013-2014, 2017 Free
+   Software Foundation, Inc.
    Jim Avera <jima@netcom.com>, October 1993.
 
    This file is part of GNU M4.
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 84cd9ea..dd6f35e 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,8 +1,8 @@
 # -*- shell-script -*-
 # @configure_input@
 # Configurable variable values for M4 test suite.
-# Copyright (C) 2000-2001, 2006, 2008, 2010, 2013-2014 Free Software
-# Foundation, Inc.
+# Copyright (C) 2000-2001, 2006, 2008, 2010, 2013-2014, 2017 Free
+# Software Foundation, Inc.
 
 # This file is part of GNU M4.
 #
diff --git a/tests/builtins.at b/tests/builtins.at
index 8bda542..ab8fa9f 100644
--- a/tests/builtins.at
+++ b/tests/builtins.at
@@ -1,6 +1,6 @@
 # Hand crafted tests for GNU M4.                               -*- Autotest -*-
-# Copyright (C) 2001, 2006-2010, 2013-2014 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2006-2010, 2013-2014, 2017 Free Software
+# Foundation, Inc.
 
 # This file is part of GNU M4.
 #
diff --git a/tests/freeze.at b/tests/freeze.at
index dd3bfed..438bcc3 100644
--- a/tests/freeze.at
+++ b/tests/freeze.at
@@ -1,5 +1,6 @@
 # Hand crafted tests for GNU M4.                               -*- Autotest -*-
-# Copyright (C) 2006-2010, 2013-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2010, 2013-2014, 2017 Free Software Foundation,
+# Inc.
 
 # This file is part of GNU M4.
 #
diff --git a/tests/generate.awk b/tests/generate.awk
index f0ee5a7..f373d7f 100755
--- a/tests/generate.awk
+++ b/tests/generate.awk
@@ -1,7 +1,7 @@
 # Extract all examples from the manual source.            -*- AWK -*-
 
-# Copyright (C) 1992, 2000-2001, 2006-2010, 2013-2014 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992, 2000-2001, 2006-2010, 2013-2014, 2017 Free
+# Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/tests/import.c b/tests/import.c
index d588c1e..cdd1176 100644
--- a/tests/import.c
+++ b/tests/import.c
@@ -1,5 +1,5 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 2003, 2006-2008, 2010, 2013-2014 Free Software
+   Copyright (C) 2003, 2006-2008, 2010, 2013-2014, 2017 Free Software
    Foundation, Inc.
 
    This file is part of GNU M4.
diff --git a/tests/iso8859.m4 b/tests/iso8859.m4
index 59fb8a4..8ffb753 100644
Binary files a/tests/iso8859.m4 and b/tests/iso8859.m4 differ
diff --git a/tests/m4.in b/tests/m4.in
index 4dd9d4f..49d456c 100644
--- a/tests/m4.in
+++ b/tests/m4.in
@@ -2,8 +2,8 @@
 # @configure_input@
 # Wrapper around a non installed m4 to make it work as an installed one.
 #
-# Copyright (C) 2001-2002, 2006-2008, 2010, 2013-2014 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2002, 2006-2008, 2010, 2013-2014, 2017 Free
+# Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/tests/macros.at b/tests/macros.at
index 11f32ee..2f8d5ba 100644
--- a/tests/macros.at
+++ b/tests/macros.at
@@ -1,5 +1,5 @@
 # Hand crafted tests for GNU M4.                               -*- Autotest -*-
-# Copyright (C) 2001, 2006-2008, 2010, 2013-2014 Free Software
+# Copyright (C) 2001, 2006-2008, 2010, 2013-2014, 2017 Free Software
 # Foundation, Inc.
 
 # This file is part of GNU M4.
diff --git a/tests/modtest.c b/tests/modtest.c
index 161b3e7..ad6d91b 100644
--- a/tests/modtest.c
+++ b/tests/modtest.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1999-2001, 2003-2004, 2006-2008, 2010, 2013-2014 Free
-   Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2003-2004, 2006-2008, 2010, 2013-2014, 2017
+   Free Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/tests/modules.at b/tests/modules.at
index 9320ce4..f4e5485 100644
--- a/tests/modules.at
+++ b/tests/modules.at
@@ -1,5 +1,5 @@
 # Hand crafted tests for GNU M4.                               -*- Autotest -*-
-# Copyright (C) 2001, 2006-2008, 2010, 2013-2014 Free Software
+# Copyright (C) 2001, 2006-2008, 2010, 2013-2014, 2017 Free Software
 # Foundation, Inc.
 
 # This file is part of GNU M4.
diff --git a/tests/options.at b/tests/options.at
index 7084207..29f41c0 100644
--- a/tests/options.at
+++ b/tests/options.at
@@ -1,6 +1,6 @@
 # Hand crafted tests for GNU M4.                               -*- Autotest -*-
-# Copyright (C) 2001, 2006-2010, 2013-2014 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2006-2010, 2013-2014, 2017 Free Software
+# Foundation, Inc.
 
 # This file is part of GNU M4.
 #
diff --git a/tests/others.at b/tests/others.at
index 9c7a0c6..1b035eb 100644
--- a/tests/others.at
+++ b/tests/others.at
@@ -1,6 +1,6 @@
 # Hand crafted tests for GNU M4.                               -*- Autotest -*-
-# Copyright (C) 2001, 2006-2010, 2013-2014 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2006-2010, 2013-2014, 2017 Free Software
+# Foundation, Inc.
 
 # This file is part of GNU M4.
 #
diff --git a/tests/shadow.c b/tests/shadow.c
index c6a64d2..ae8cac7 100644
--- a/tests/shadow.c
+++ b/tests/shadow.c
@@ -1,6 +1,6 @@
 /* GNU m4 -- A simple macro processor
-   Copyright (C) 1999-2000, 2006-2008, 2010, 2013-2014 Free Software
-   Foundation, Inc.
+   Copyright (C) 1999-2000, 2006-2008, 2010, 2013-2014, 2017 Free
+   Software Foundation, Inc.
 
    This file is part of GNU M4.
 
diff --git a/tests/stackovf.test b/tests/stackovf.test
index f0ebc67..d57fc0f 100755
--- a/tests/stackovf.test
+++ b/tests/stackovf.test
@@ -1,6 +1,6 @@
 #!/bin/sh
 # This file is part of the GNU m4 testsuite
-# Copyright (C) 2000, 2003, 2007, 2010, 2013-2014 Free Software
+# Copyright (C) 2000, 2003, 2007, 2010, 2013-2014, 2017 Free Software
 # Foundation, Inc.
 #
 # This file is part of GNU M4.
diff --git a/tests/testsuite.at b/tests/testsuite.at
index a7cdfc4..19fc9ee 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,8 +1,8 @@
 # Process with autom4te to create an -*- Autotest -*- test suite.
 
 # Test suite for GNU M4.
-# Copyright (C) 2001, 2006-2010, 2013-2014 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001, 2006-2010, 2013-2014, 2017 Free Software
+# Foundation, Inc.
 
 # This file is part of GNU M4.
 #


hooks/post-receive
-- 
GNU M4 source repository


From MAILER-DAEMON Mon Jan 09 14:56:49 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cQg3l-0008V4-Jx
	for mharc-m4-commit@gnu.org; Mon, 09 Jan 2017 14:56:49 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36488)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cQg3i-0008Rn-LC
	for m4-commit@gnu.org; Mon, 09 Jan 2017 14:56:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cQg3g-0004LR-W3
	for m4-commit@gnu.org; Mon, 09 Jan 2017 14:56:46 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:50259)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1cQg3g-0004LN-S4
	for m4-commit@gnu.org; Mon, 09 Jan 2017 14:56:44 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69750)
	id 8B3AB2201B9; Mon,  9 Jan 2017 19:56:44 +0000 (UTC)
From: "Eric Blake" <eblake@redhat.com>
To: m4-commit@gnu.org
Subject: [SCM] GNU M4 source repository branch, master,
	updated. cvs-readonly-359-gd69fa52
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a6d4737a42a19cca2400d9f3d2cd035a016dcab4
X-Git-Newrev: d69fa5284851b2b7aac25ffac638b6b379994db5
Message-Id: <20170109195644.8B3AB2201B9@vcs.savannah.gnu.org>
Date: Mon,  9 Jan 2017 19:56:44 +0000 (UTC)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: m4-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: git commit notices for  GNU m4 <m4-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/m4-commit/>
List-Post: <mailto:m4-commit@gnu.org>
List-Help: <mailto:m4-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/m4-commit>,
	<mailto:m4-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2017 19:56:48 -0000

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=d69fa5284851b2b7aac25ffac638b6b379994db5

The branch, master has been updated
       via  d69fa5284851b2b7aac25ffac638b6b379994db5 (commit)
       via  9ad9cd6305ce42713c7cce9ae0bfb81c7a758326 (commit)
      from  a6d4737a42a19cca2400d9f3d2cd035a016dcab4 (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 d69fa5284851b2b7aac25ffac638b6b379994db5
Author: Eric Blake <eblake@redhat.com>
Date:   Sat Dec 31 14:56:15 2016 -0600

    maint: improve generation of ChangeLog from git commits
    
    Follow the practice set in numerous other GNU projects, where
    the ChangeLog (since 2015) is generated from git commit messages.
    This avoids duplication or subtle differences between the two,
    as well as making it easier to merge patches across branches
    (as good as Bruno Haible's 'git-merge-changelog' helper program
    is, it still doesn't handle cross-branch cherry-picks very well).
    
    * Makefile.am (EXTRA_DIST): Rely on gnulib to ship gitlog-to-changelog.
    ($(changelog)): Update rule to match branch-1.4 style.
    * .gitattributes: Drop stale mention of Changelog.
    * HACKING: Reword to match new procedure, and simplify by
    referring to an external description of ChangeLog style.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>
    (cherry picked from commit 5456676ea90dfedd9b54c843f15b006d02150d06)
    [commit 6bdb0a4b75 already started the conversion, but this updates
    the approach to be more like other GNU projects, and branch-1.4]

commit 9ad9cd6305ce42713c7cce9ae0bfb81c7a758326
Author: Eric Blake <eblake@redhat.com>
Date:   Mon Jan 9 12:07:51 2017 -0600

    maint: improve 'make distcheck'
    
    Commit b29e2867 added gnulib's src/assure.h during bootstrap to fix
    development builds, but forgot to check that tarballs also build.
    
    With this patch, things get further, although I'm still facing a
    failure because the VPATH 'make check' portion of distcheck is
    failing to load modules, where an in-tree build succeeded.
    
    * Makefile.am (src_m4_SOURCES): Add assure.h.
    
    Signed-off-by: Eric Blake <eblake@redhat.com>

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

Summary of changes:
 .gitattributes |    1 -
 HACKING        |   90 ++++++++++++++------------------------------------------
 Makefile.am    |   19 +++++++-----
 3 files changed, 33 insertions(+), 77 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 233cfcd..f7c0ed7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,5 @@
 # See ./bootstrap for some helpful ~/.gitconfig or .git/config settings
 # needed for using these attributes effectively.
-ChangeLog merge=merge-changelog
 *.texi* diff=texinfo
 null.* diff merge
 iso8859.m4 diff merge
diff --git a/HACKING b/HACKING
index 83990e1..0e5cd66 100644
--- a/HACKING
+++ b/HACKING
@@ -154,70 +154,24 @@ and is not part of a release distribution.
 5. Editing 'ChangeLog'
 ======================
 
+* The ChangeLog is generated from git commit comments.  Each commit log
+  should start with a one-line summary, a blank line, and then a
+  ChangeLog-style entry for all affected files.  However, it's fine --
+  even recommended -- to write a few lines of prose describing the
+  change, when the summary and ChangeLog entries don't give enough of
+  the big picture.  Omit the leading TABs that you're used to seeing in
+  a "real" ChangeLog file, but keep the maximum line length at 72 or
+  smaller, so that the generated ChangeLog lines, each with its leading
+  TAB, will not exceed 80 columns.  As for the ChangeLog-style content,
+  please follow these guidelines:
+
+    http://www.gnu.org/software/guile/changelogs/guile-changelogs_3.html
+
 * When in doubt, check that emacs can syntax-color properly in
   change-log-mode.  And preferably use emacs 'C-x 4 a'
   (add-change-log-entry-other-window) to open ChangeLog with an
-  appropriate new template.
-
-* If this change is by a different author, or on a different date to the
-  last entry start a new entry at the top of the file with the format
-  (note two spaces between each field):
-
-yyyy-mm-dd  Name of Author  <email@address>
-
-*  If more than one person collaborated on the change, additional
-   authors can be listed on subsequent lines, thus:
-
-yyyy-mm-dd  Name of Main Author  <email@address>,
-            Name of Contributor  <another@email.address>
-
-* Where a change author did not supply a copyright assignment, but the
-  changes they submitted were sufficiently trivial to commit in any case
-  (see the GCS for guidelines on this), then flag this against their
-  name in the header, thus:
-
-yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
-
-* Preferably the next part should be a description of the overall
-  purpose of the change, separated from the header by a blank line,
-  indented by 1 tab, and filled at column 72.  The last character of the
-  description should be a colon, :.
-
-* Changes to each file come next.  Each new file starts on a new line,
-  indented by 1 tab and starting with an asterisk and a space.  Multiple
-  files can be listed here relative to $top_srcdir, and comma separated.
-  Names of functions (or sections as appropriate) to which the change
-  applies should be named inside parentheses and comma separated.  If
-  this goes beyond column 72, then parens should be closed and re-opened
-  on the next line:
-
-	* file, another/file, test/testcases/foo.test (func_foo)
-	(func_bar, func_baz): Description of changes.
-
-* If the change does not apply to particular functions (or sections),
-  the section list can be omitted:
-
-	* file, another/file, test/testcases/foo.test: General changes.
-
-* If the changes are particular to certain architectures, they should be
-  listed after the functions in square brackets:
-
-	* file, another/file (func_foo) [linux, solaris]: Description of
-	changes.
-
-* Subsequent changes in other files that are related to the same overall
-  enhancement or bugfix should be listed concurrently, without blank
-  lines.  Always start a fresh line for a new file:
-
-	* file, another/file (func_foo) [linux, solaris]: Description of
-	changes.
-	* doc/foo.texi (Invoking Foo): Document.
-	* NEWS: Updated.
-
-* If the change is in response to a problem reported by someone other
-  than the author, then credit them at the end of the description with:
-
-	Reported by Reporter Name <email@address>.
+  appropriate new template, which you can then paste into your git
+  commit editing session.
 
 * See the GNU Coding Standards document for more details on ChangeLog
   formatting.
@@ -225,8 +179,8 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
 6. Formatting
 =============
 
-* Use space-only indentation in nearly all files (Makefile and
-  ChangeLogs being the exception).
+* Use space-only indentation in nearly all files (Makefile inputs being
+  the exception).
 
   If you use Emacs and your m4 working directory name matches,
   this code in your ~/.emacs enables the right mode:
@@ -290,8 +244,8 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
   In particular, ensure that the gnulib version is at least as new as
   the latest stable libtool release.
 
-* Update the version number in NEWS and ChangeLog, and mention in README
-  whether the release is stable.  See
+* Update the version number in NEWS, and mention in README whether the
+  release is stable.  See
   http://www.gnu.org/software/libtool/contribute.html for details of the
   numbering scheme (M4 uses a similar scheme to libtool, although
   intra-release versions carry more information thanks to
@@ -337,9 +291,9 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
   See http://www.gnu.org/software/libtool/contribute.html for details of
   the numbering scheme.
 
-* Update NEWS, README, and ChangeLog to start the intra-release changes,
-  and run `git commit'.  Then run `git push origin refs/tags/v<version>'
-  to push the release tag and complete the release.
+* Update NEWS and README to start the intra-release changes, and run
+  `git commit'.  Then run `git push origin refs/tags/v<version>' to push
+  the release tag and complete the release.
 
 * For stable releases, update the webpages.
   Run `build-aux/gnu-web-doc-update', which runs `make web-manual' on a
diff --git a/Makefile.am b/Makefile.am
index 1f38595..d432696 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,22 +65,24 @@ AM_CPPFLAGS    += -Im4/gnu -I$(srcdir)/m4/gnu \
 		  -Im4 -I$(srcdir)/m4
 AM_LDFLAGS     += $(OS2_LDFLAGS)
 EXTRA_DIST     += bootstrap cfg.mk maint.mk .version .prev-version \
-		  $(config_macro_dir)/gnulib-cache.m4 $(gitlog_to_changelog)
+		  $(config_macro_dir)/gnulib-cache.m4
 BUILT_SOURCES  += .version
 .version:
-	echo $(VERSION) > $@-t && mv $@-t $@
+	$(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@
 dist-hook: dist-tarball-version
 dist-tarball-version:
-	echo $(VERSION) > $(distdir)/.tarball-version
+	$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
 
 dist-hook: $(changelog)
 changelog_start_date = 2011-01-01
 $(changelog): FORCE
-	$(AM_V_GEN)if test -d '$(srcdir)/.git'; then	\
-	  $(gitlog_to_changelog)			\
-	    --since=$(changelog_start_date) > '$@T';	\
-	  rm -f '$@'; mv '$@T' '$@';			\
-	  cat '$(changelog_old)' >> '$@';		\
+	$(AM_V_GEN)if test -d '$(top_srcdir)/.git'; then	\
+          test -e '$(log_fix)'					\
+            && amend_git_log="--amend=$(log_fix)"		\
+            || amend_git_log=;					\
+	  $(gitlog_to_changelog) $$amend_git_log		\
+	    --since=$(changelog_start_date) > '$@T'		\
+	  && rm -f '$@' && mv '$@T' '$@';			\
 	fi
 
 # Sort in traditional ASCII order, regardless of the current locale;
@@ -123,6 +125,7 @@ MAINTAINERCLEANFILES += \
 
 bin_PROGRAMS	= src/m4
 src_m4_SOURCES	= \
+		  src/assure.h \
 		  src/xstrtoul.c \
 		  src/xstrtol-error.c \
 		  src/xstrtol.c \


hooks/post-receive
-- 
GNU M4 source repository


