Prepare to bulk update copyright year.

* gnulib: Update.
* ltdl/m4/gnulib-cache.m4: Import update-copyright module.
* cfg.mk (update-copyright-env): Enforce longhand behavior.
* .x-update-copyright: New file.
* Makefile.am (syntax_check_exceptions): Distribute exception.
* ltdl/m4/debug.m4: Add FSF copyright.
* ltdl/m4/m4-error.m4: Fix FSF name in copyright.
* ltdl/m4/m4-getopt.m4: Likewise.
* ltdl/m4/m4-gettext.m4: Likewise.
* ltdl/m4/m4-obstack.m4: Likewise.
* ltdl/m4/m4-regex.m4: Likewise.
* ltdl/m4/m4-rename.m4: Likewise.
* ltdl/m4/m4-syscmd.m4: Likewise.
* modules/modtest.m4: Likewise.
* modules/perl.m4: Likewise.
* modules/shadow.m4: Likewise.
* modules/stdlib.m4: Likewise.
* modules/time.m4: Likewise.
* modules/time2.m4: Likewise.
* tests/iso8859.m4: Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>
(cherry picked from commit 548145f74620c9deb456c9eec3f20e18968d4da7)

20 files changed, 49 insertions, 16 deletions

diff --git a/.x-update-copyright b/.x-update-copyright
new file mode 100644
index 00000000..d0a3998e
--- /dev/null
+++ b/.x-update-copyright
@@ -0,0 +1 @@
+ltdl/m4/gnulib-cache.m4
diff --git a/ChangeLog b/ChangeLog
index bece78bb..e4b51cf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
 2010-01-05  Eric Blake  <ebb9@byu.net>
 
+	Prepare to bulk update copyright year.
+	* gnulib: Update.
+	* ltdl/m4/gnulib-cache.m4: Import update-copyright module.
+	* cfg.mk (update-copyright-env): Enforce longhand behavior.
+	* .x-update-copyright: New file.
+	* Makefile.am (syntax_check_exceptions): Distribute exception.
+	* ltdl/m4/debug.m4: Add FSF copyright.
+	* ltdl/m4/m4-error.m4: Fix FSF name in copyright.
+	* ltdl/m4/m4-getopt.m4: Likewise.
+	* ltdl/m4/m4-gettext.m4: Likewise.
+	* ltdl/m4/m4-obstack.m4: Likewise.
+	* ltdl/m4/m4-regex.m4: Likewise.
+	* ltdl/m4/m4-rename.m4: Likewise.
+	* ltdl/m4/m4-syscmd.m4: Likewise.
+	* modules/modtest.m4: Likewise.
+	* modules/perl.m4: Likewise.
+	* modules/shadow.m4: Likewise.
+	* modules/stdlib.m4: Likewise.
+	* modules/time.m4: Likewise.
+	* modules/time2.m4: Likewise.
+	* tests/iso8859.m4: Likewise.
+
 	Use gnulib maintainer-makefile module.
 	* ltdl/m4/gnulib-cache.m4: Import maintainer-makefile module.
 	* cfg.mk (local-checks-to-skip): Drop changelog-check; add
diff --git a/Makefile.am b/Makefile.am
index 05fd0bc9..f073c1b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,7 +54,8 @@ include ltdl/Makefile.inc
 # given in build-aux/git-version-gen.
 syntax_check_exceptions = \
 	.x-sc_require_config_h \
-	.x-sc_require_config_h_first
+	.x-sc_require_config_h_first \
+	.x-update-copyright
 
 AM_CPPFLAGS    += -Ignu -I$(srcdir)/gnu \
 		  -Im4 -I$(srcdir)/m4
diff --git a/cfg.mk b/cfg.mk
index fe48db58..336e8b31 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -23,3 +23,8 @@ local-checks-to-skip = sc_cast_of_x_alloc_return_value
 
 # Hash of NEWS contents, to ensure we don't add entries to wrong section.
 old_NEWS_hash = b63892a79436f9f3cd05e10c3c4657ef
+
+# Always use longhand copyrights.
+update-copyright-env = \
+  UPDATE_COPYRIGHT_USE_INTERVALS=0 \
+  UPDATE_COPYRIGHT_MAX_LINE_LENGTH=72
diff --git a/ltdl/m4/debug.m4 b/ltdl/m4/debug.m4
index 32600c7a..7d0280f0 100644
--- a/ltdl/m4/debug.m4
+++ b/ltdl/m4/debug.m4
@@ -1,7 +1,9 @@
 ##                                                           -*- Autoconf -*-
 ## debug.m4 -- massage compiler flags for debugging/optimisation
 ##
-## Copyright (C) 1999-2000, 2006, 2007 Ralf S. Engelschall
+## Copyright (C) 2000, 2001, 2003, 2005, 2006, 2007 Free Software
+## Foundation, Inc.
+## Copyright (C) 1999-2000 Ralf S. Engelschall
 ## Written by <rse@engelschall.com>
 ## Modified for M4 by Gary V. Vaughan <gary@gnu.org>
 ##
diff --git a/ltdl/m4/gnulib-cache.m4 b/ltdl/m4/gnulib-cache.m4
index 06a8fb82..1e3d9578 100644
--- a/ltdl/m4/gnulib-cache.m4
+++ b/ltdl/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute exit fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname propername quote regex regexprops-generic rename setenv snprintf-posix sprintf-posix stdbool stdlib-safer strnlen strtod strtol tempname unlocked-io unsetenv vasnprintf-posix verify verror wait-process xalloc xalloc-die xmemdup0 xoset xprintf-posix xstrndup xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libgnu --source-base=gnu --m4-base=ltdl/m4 --doc-base=doc --tests-base=tests/gnu --aux-dir=build-aux --with-tests --libtool --macro-prefix=M4 assert autobuild avltree-oset binary-io bitrotate clean-temp cloexec close-stream closein config-h configmake dirname error execute exit fdl-1.3 fflush filenamecat flexmember fopen fopen-safer freadptr freadseek fseeko gendocs gettext git-version-gen gnumakefile gnupload gpl-3.0 intprops inttypes maintainer-makefile memchr2 memcmp2 memmem mkstemp obstack obstack-printf-posix pipe progname propername quote regex regexprops-generic rename setenv snprintf-posix sprintf-posix stdbool stdlib-safer strnlen strtod strtol 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([local])
@@ -77,6 +77,7 @@ gl_MODULES([
   tempname
   unlocked-io
   unsetenv
+  update-copyright
   vasnprintf-posix
   verify
   verror
diff --git a/ltdl/m4/m4-error.m4 b/ltdl/m4/m4-error.m4
index 1fac7773..76331e13 100644
--- a/ltdl/m4/m4-error.m4
+++ b/ltdl/m4/m4-error.m4
@@ -2,7 +2,7 @@
 # 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 Free Software Foundation, Inc
+# Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/ltdl/m4/m4-getopt.m4 b/ltdl/m4/m4-getopt.m4
index 9c606ddc..d089a17b 100644
--- a/ltdl/m4/m4-getopt.m4
+++ b/ltdl/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, 2006, 2007, 2009 Free Software Foundation, Inc
+# Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/ltdl/m4/m4-gettext.m4 b/ltdl/m4/m4-gettext.m4
index 7b5e640e..9f8f1aec 100644
--- a/ltdl/m4/m4-gettext.m4
+++ b/ltdl/m4/m4-gettext.m4
@@ -2,7 +2,7 @@
 # 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 Free Software Foundation, Inc
+# Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/ltdl/m4/m4-obstack.m4 b/ltdl/m4/m4-obstack.m4
index 62fafe3e..e980da78 100644
--- a/ltdl/m4/m4-obstack.m4
+++ b/ltdl/m4/m4-obstack.m4
@@ -1,7 +1,8 @@
 #                                                            -*- Autoconf -*-
 # m4-obstack.m4 -- the libc supplied version of obstacks if available.
 #
-# Copyright (C) 2000, 2001, 2003, 2004, 2006, 2007 Free Software Foundation, Inc
+# Copyright (C) 2000, 2001, 2003, 2004, 2006, 2007 Free Software
+# Foundation, Inc.
 # Written by Gary V. Vaughan <gary@gnu.org>
 #
 # This file is part of GNU M4.
diff --git a/ltdl/m4/m4-regex.m4 b/ltdl/m4/m4-regex.m4
index 044f5386..02da0988 100644
--- a/ltdl/m4/m4-regex.m4
+++ b/ltdl/m4/m4-regex.m4
@@ -2,7 +2,7 @@
 # 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 Free Software Foundation, Inc
+# Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/ltdl/m4/m4-rename.m4 b/ltdl/m4/m4-rename.m4
index 892032b8..e8d61a7c 100644
--- a/ltdl/m4/m4-rename.m4
+++ b/ltdl/m4/m4-rename.m4
@@ -2,7 +2,7 @@
 # m4-rename.m4 -- Test the abilities of rename.
 # Written by Eric Blake <ebb9@byu.net>
 #
-# Copyright (C) 2008 Free Software Foundation, Inc
+# Copyright (C) 2008 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/ltdl/m4/m4-syscmd.m4 b/ltdl/m4/m4-syscmd.m4
index 3feddb83..37fea823 100644
--- a/ltdl/m4/m4-syscmd.m4
+++ b/ltdl/m4/m4-syscmd.m4
@@ -2,7 +2,7 @@
 # m4-syscmd.m4 -- Allow choice of syscmd shell.
 # Written by Eric Blake <ebb9@byu.net>
 #
-# Copyright (C) 2009 Free Software Foundation, Inc
+# Copyright (C) 2009 Free Software Foundation, Inc.
 #
 # This file is part of GNU M4.
 #
diff --git a/modules/modtest.m4 b/modules/modtest.m4
index 2b550259..617b08de 100644
--- a/modules/modtest.m4
+++ b/modules/modtest.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006 Free Software Foundation
+dnl Copyright (C) 2006 Free Software Foundation, 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/modules/perl.m4 b/modules/perl.m4
index 18288a26..ac555b71 100644
--- a/modules/perl.m4
+++ b/modules/perl.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006 Free Software Foundation
+dnl Copyright (C) 2006 Free Software Foundation, 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/modules/shadow.m4 b/modules/shadow.m4
index 98dfe585..836279c4 100644
--- a/modules/shadow.m4
+++ b/modules/shadow.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006 Free Software Foundation
+dnl Copyright (C) 2006 Free Software Foundation, 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/modules/stdlib.m4 b/modules/stdlib.m4
index 6d764eac..e3ae796f 100644
--- a/modules/stdlib.m4
+++ b/modules/stdlib.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006 Free Software Foundation
+dnl Copyright (C) 2006 Free Software Foundation, 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/modules/time.m4 b/modules/time.m4
index 2db366de..0a4f8cd8 100644
--- a/modules/time.m4
+++ b/modules/time.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006 Free Software Foundation
+dnl Copyright (C) 2006 Free Software Foundation, 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/modules/time2.m4 b/modules/time2.m4
index 3add5c8b..3547b241 100644
--- a/modules/time2.m4
+++ b/modules/time2.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2006 Free Software Foundation
+dnl Copyright (C) 2006 Free Software Foundation, 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/tests/iso8859.m4 b/tests/iso8859.m4
index 903db6f1..ac5322e6 100644
--- a/tests/iso8859.m4
+++ b/tests/iso8859.m4