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 <[email protected]> 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 <[email protected]> [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 <[email protected]> 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 <[email protected]> (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 <[email protected]> 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 <[email protected]> (cherry picked from commit a82e6b74a462b16effb7304b850f72faf727aec5) commit 83e9a85bc8371b92a74dee8f6ede0cbbc89499dd Author: Eric Blake <[email protected]> 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 <[email protected]> (cherry picked from commit c8a4b7c32db3a6d8d5dc7a9997df2c80ac95b030) commit f8822d40ca17af5fdc4703fca2dfc4b01110806e Author: Eric Blake <[email protected]> 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 <[email protected]> (cherry picked from commit c7a3591347238aa34defded34609007b326a0984) commit 8a1c7bd2101f46513d1a9bfba0297baa58acf409 Author: Eric Blake <[email protected]> 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 <[email protected]> commit b29e28672d50a42f24801e4c742300012474fe07 Author: Eric Blake <[email protected]> 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 <[email protected]> (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 [email protected] 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 [email protected]. 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 [email protected] Alan Magnuson [email protected] Albert Chin [email protected] 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> # -# 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 <[email protected]> # -# 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 <[email protected]> # -# 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 <[email protected]> # # 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 <[email protected]> # -# 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 <[email protected]> # -# 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 <[email protected]> # -# 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 <[email protected]> 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 <[email protected]> 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 = [email protected] # 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 <[email protected]>, 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
