m4, help2man: Update from gnulib

* gettext-runtime/m4/codeset.m4: Update copyright year.
* gettext-runtime/m4/gettext.m4: Likewise.
* gettext-runtime/m4/iconv.m4: Likewise.
* gettext-runtime/m4/intl.m4: Likewise.
* gettext-runtime/m4/intldir.m4: Likewise.
* gettext-runtime/m4/intlmacosx.m4: Likewise.
* gettext-runtime/m4/lcmessage.m4: Likewise.
* gettext-runtime/m4/nls.m4: Likewise.
* gettext-runtime/m4/po.m4: Likewise.
* gettext-runtime/m4/extern-inline.m4: Likewise.  Port the following
change:
  2015-04-29  Paul Eggert  <eggert@cs.ucla.edu>
    extern-inline: no need for workaround in GCC 5.1
    * doc/extern-inline.texi (extern inline):
    * m4/extern-inline.m4 (gl_EXTERN_INLINE):
    GCC bugs 54113 and 63877 are fixed in GCC 5.1, so don't work
    around these bugs in GCC 5.1 and later.  Maybe in a decade or
    two we can remove these workarounds.
* gettext-tools/man/help2man: Update copyright year.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 4ba44f6316bc0a28646ca56855411239ab590217..a07b5bed08bf974e030f6d0922589f81f2774f97 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,23 @@
+2015-06-23  Daiki Ueno  <ueno@gnu.org>
+
+       * m4/codeset.m4: Update copyright year.
+       * m4/gettext.m4: Likewise.
+       * m4/iconv.m4: Likewise.
+       * m4/intl.m4: Likewise.
+       * m4/intldir.m4: Likewise.
+       * m4/intlmacosx.m4: Likewise.
+       * m4/lcmessage.m4: Likewise.
+       * m4/nls.m4: Likewise.
+       * m4/po.m4: Likewise.
+       * m4/extern-inline.m4: Likewise.  Port the following change:
+           2015-04-29  Paul Eggert  <eggert@cs.ucla.edu>
+             extern-inline: no need for workaround in GCC 5.1
+             * doc/extern-inline.texi (extern inline):
+             * m4/extern-inline.m4 (gl_EXTERN_INLINE):
+             GCC bugs 54113 and 63877 are fixed in GCC 5.1, so don't work
+             around these bugs in GCC 5.1 and later.  Maybe in a decade or
+             two we can remove these workarounds.
+
 2015-06-23  Daiki Ueno  <ueno@gnu.org>
 
        * ABOUT-NLS: Regenerate for 0.19.5.

diff --git a/gettext-runtime/m4/codeset.m4 b/gettext-runtime/m4/codeset.m4
index 1c52ffc1be16d1e3408f085cb2d062b3779ef13b..d7de8d67e0d2c0a70dcdb911f6ac7893d2c3bca4 100644 (file)
--- a/gettext-runtime/m4/codeset.m4
+++ b/gettext-runtime/m4/codeset.m4
@@ -1,5 +1,5 @@
 # codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2014 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/gettext-runtime/m4/extern-inline.m4 b/gettext-runtime/m4/extern-inline.m4
index e74339a165e0a78085d550a30a119ad012a1ca2e..72800650e6f23e481623892512083d6f5071b06a 100644 (file)
--- a/gettext-runtime/m4/extern-inline.m4
+++ b/gettext-runtime/m4/extern-inline.m4
@@ -74,12 +74,13 @@ AC_DEFUN([gl_EXTERN_INLINE],
 # define _GL_EXTERN_INLINE static _GL_UNUSED
 #endif
 
-/* In GCC, suppress bogus "no previous prototype for 'FOO'"
+/* In GCC 4.6 (inclusive) to 5.1 (exclusive),
+   suppress bogus "no previous prototype for 'FOO'"
    and "no previous declaration for 'FOO'" diagnostics,
    when FOO is an inline function in the header; see
    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113> and
    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63877>.  */
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__
 # if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
 #  define _GL_INLINE_HEADER_CONST_PRAGMA
 # else

diff --git a/gettext-runtime/m4/gettext.m4 b/gettext-runtime/m4/gettext.m4
index ce5f5ea93a5b438017154fed8f5b48c440df17e2..be247bf7b88860d0f565884bd192d44f6e23e9ec 100644 (file)
--- a/gettext-runtime/m4/gettext.m4
+++ b/gettext-runtime/m4/gettext.m4
@@ -1,5 +1,5 @@
 # gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014 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/gettext-runtime/m4/iconv.m4 b/gettext-runtime/m4/iconv.m4
index 5a6c29bd8960adc3dc658d7a1ad9c3bf526fb780..4e37363156620d7b2dd33996846464ae3a3c4b2c 100644 (file)
--- a/gettext-runtime/m4/iconv.m4
+++ b/gettext-runtime/m4/iconv.m4
@@ -1,5 +1,5 @@
 # iconv.m4 serial 19 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2014 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/gettext-runtime/m4/intl.m4 b/gettext-runtime/m4/intl.m4
index 87de63b39419650afef3f742d309977e9726d5d3..0c29ad0df8e312a12bade9faa525bbe6acc542be 100644 (file)
--- a/gettext-runtime/m4/intl.m4
+++ b/gettext-runtime/m4/intl.m4
@@ -1,5 +1,5 @@
 # intl.m4 serial 28 (gettext-0.19)
-dnl Copyright (C) 1995-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014 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/gettext-runtime/m4/intldir.m4 b/gettext-runtime/m4/intldir.m4
index 11641483811e8bc9ea79dfb19bb333166d009f35..73b672a576864378bf9be74652f32d86953d0cef 100644 (file)
--- a/gettext-runtime/m4/intldir.m4
+++ b/gettext-runtime/m4/intldir.m4
@@ -1,5 +1,5 @@
 # intldir.m4 serial 2 (gettext-0.18)
-dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2014 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/gettext-runtime/m4/intlmacosx.m4 b/gettext-runtime/m4/intlmacosx.m4
index 0d8d2988c9b6cf78e9aaf1b8be9afb589e9b5462..8a045f6a295781c3c08e38df8d053e30011b65f1 100644 (file)
--- a/gettext-runtime/m4/intlmacosx.m4
+++ b/gettext-runtime/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 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/gettext-runtime/m4/lcmessage.m4 b/gettext-runtime/m4/lcmessage.m4
index 2fcce61be849ad12a68f61c29b9f1b6aaabca470..7470ec5973ad7e98438b1786153ce76505583c05 100644 (file)
--- a/gettext-runtime/m4/lcmessage.m4
+++ b/gettext-runtime/m4/lcmessage.m4
@@ -1,5 +1,5 @@
 # lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2015 Free Software Foundation,
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 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,

diff --git a/gettext-runtime/m4/nls.m4 b/gettext-runtime/m4/nls.m4
index 33d66c188d325a8aea3f32e60c2066988938e168..53cdc8be8becc87942a1fcd7ea1ef088f98d81ac 100644 (file)
--- a/gettext-runtime/m4/nls.m4
+++ b/gettext-runtime/m4/nls.m4
@@ -1,5 +1,5 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2015 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 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,

diff --git a/gettext-runtime/m4/po.m4 b/gettext-runtime/m4/po.m4
index c1e36ef2d3adb0aefbeb1ee3efb0f9d5967d6c35..43012dca1b403d6b6fddbbde35b4449f5caa7191 100644 (file)
--- a/gettext-runtime/m4/po.m4
+++ b/gettext-runtime/m4/po.m4
@@ -1,5 +1,5 @@
 # po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014 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/gettext-tools/man/ChangeLog b/gettext-tools/man/ChangeLog
index 061a80cef328ec14a878e7cd46d17b3c4e21b13e..75f05f25f9eba20d8b1d7a4fda3a6c8fbbed2110 100644 (file)
--- a/gettext-tools/man/ChangeLog
+++ b/gettext-tools/man/ChangeLog
@@ -1,3 +1,7 @@
+2015-06-23  Daiki Ueno  <ueno@gnu.org>
+
+       * help2man: Update copyright year.
+
 2014-12-24  Daiki Ueno  <ueno@gnu.org>
 
        * gettext 0.19.4 released.

diff --git a/gettext-tools/man/help2man b/gettext-tools/man/help2man
index e0a957b1c5e94d53de49a9e25d081d71299fce43..1b6ad654372c05add272a43cb7ced167eb30124c 100755 (executable)
--- a/gettext-tools/man/help2man
+++ b/gettext-tools/man/help2man
@@ -31,7 +31,7 @@ my $this_version = '1.24';
 my $version_info = <<EOT;
 GNU $this_program $this_version
 
-Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+Copyright (C) 1997-2000, 2015 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.