From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 1 Jan 2018 09:24:45 +0000 (-0800)
Subject: Merge from gnulib, mostly to fix copyright years
X-Git-Tag: emacs-27.0.90~5942
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=751989772768fe787ec0bb02929c3d2a49805388;p=emacs.git

Merge from gnulib, mostly to fix copyright years
---

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 6be308dd9c7..770cb5c7eb0 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
 timestamp='2017-12-17'
 
diff --git a/build-aux/config.sub b/build-aux/config.sub
index 9e84c010ecf..4fa505b51aa 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2018 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
 timestamp='2017-11-23'
 
diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex
index b0179d6b007..1987c50ba26 100644
--- a/doc/misc/texinfo.tex
+++ b/doc/misc/texinfo.tex
@@ -5,7 +5,10 @@
 %
 \def\texinfoversion{2017-12-26.21}
 %
-% Copyright 1985-1986, 1988, 1990-2018 Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
+% Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software: you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
diff --git a/lib/fsusage.c b/lib/fsusage.c
index 3482c5f3ac3..6920f8530a1 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -1,7 +1,7 @@
 /* fsusage.c -- return space usage of mounted file systems
 
-   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2018 Free
-   Software Foundation, Inc.
+   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2018 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/lib/gnulib.mk.in b/lib/gnulib.mk.in
index d7300614828..49f4d236e44 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -540,6 +540,9 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
 INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
+JSON_CFLAGS = @JSON_CFLAGS@
+JSON_LIBS = @JSON_LIBS@
+JSON_OBJ = @JSON_OBJ@
 KQUEUE_CFLAGS = @KQUEUE_CFLAGS@
 KQUEUE_LIBS = @KQUEUE_LIBS@
 KRB4LIB = @KRB4LIB@
@@ -945,7 +948,6 @@ pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
-runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index f5faacf055a..f9dfbcb7a04 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,8 +1,7 @@
 # serial 32
 # Obtaining file system usage information.
 
-# Copyright (C) 1997-1998, 2000-2001, 2003-2018 Free Software
-# Foundation, Inc.
+# Copyright (C) 1997-1998, 2000-2001, 2003-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,