gettext-0.19.8.1HEADgettext-0.19.8.1master

89 files changed, 197 insertions, 97 deletions

diff --git a/gettext-runtime/gnulib-m4/00gnulib.m4 b/gettext-runtime/gnulib-m4/00gnulib.m4
index c7103ed..bb37e32 100644
--- a/gettext-runtime/gnulib-m4/00gnulib.m4
+++ b/gettext-runtime/gnulib-m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 3
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 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/gnulib-m4/absolute-header.m4 b/gettext-runtime/gnulib-m4/absolute-header.m4
index bc19dfc..7ffc38d 100644
--- a/gettext-runtime/gnulib-m4/absolute-header.m4
+++ b/gettext-runtime/gnulib-m4/absolute-header.m4
@@ -1,5 +1,5 @@
 # absolute-header.m4 serial 16
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 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/gnulib-m4/alloca.m4 b/gettext-runtime/gnulib-m4/alloca.m4
index c7165e5..64f9a79 100644
--- a/gettext-runtime/gnulib-m4/alloca.m4
+++ b/gettext-runtime/gnulib-m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2006, 2011, 2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006, 2011, 2015-2016 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/gnulib-m4/ansi-c++.m4 b/gettext-runtime/gnulib-m4/ansi-c++.m4
index d1f3e9d..a3d1e0b 100644
--- a/gettext-runtime/gnulib-m4/ansi-c++.m4
+++ b/gettext-runtime/gnulib-m4/ansi-c++.m4
@@ -1,5 +1,5 @@
 # ansi-c++.m4 serial 9
-dnl Copyright (C) 2002-2003, 2005, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2005, 2010-2016 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/gnulib-m4/asm-underscore.m4 b/gettext-runtime/gnulib-m4/asm-underscore.m4
index f11e712..547dd62 100644
--- a/gettext-runtime/gnulib-m4/asm-underscore.m4
+++ b/gettext-runtime/gnulib-m4/asm-underscore.m4
@@ -1,5 +1,5 @@
-# asm-underscore.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# asm-underscore.m4 serial 3
+dnl Copyright (C) 2010-2016 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.
@@ -29,7 +29,7 @@ int foo(void) { return 0; }
 EOF
      # Look for the assembly language name in the .s file.
      AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
-     if grep _foo conftest.$gl_asmext >/dev/null ; then
+     if LC_ALL=C grep -E '(^|[^a-zA-Z0-9_])_foo([^a-zA-Z0-9_]|$)' conftest.$gl_asmext >/dev/null; then
        gl_cv_prog_as_underscore=yes
      else
        gl_cv_prog_as_underscore=no
diff --git a/gettext-runtime/gnulib-m4/atexit.m4 b/gettext-runtime/gnulib-m4/atexit.m4
index ace0061..b9388b3 100644
--- a/gettext-runtime/gnulib-m4/atexit.m4
+++ b/gettext-runtime/gnulib-m4/atexit.m4
@@ -1,5 +1,5 @@
 # atexit.m4 serial 4
-dnl Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2016 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/gnulib-m4/canonicalize.m4 b/gettext-runtime/gnulib-m4/canonicalize.m4
index 6d932fd..bfc9ebe 100644
--- a/gettext-runtime/gnulib-m4/canonicalize.m4
+++ b/gettext-runtime/gnulib-m4/canonicalize.m4
@@ -1,6 +1,6 @@
-# canonicalize.m4 serial 26
+# canonicalize.m4 serial 27
 
-dnl Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2007, 2009-2016 Free Software Foundation, Inc.
 
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -83,22 +83,27 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS],
           char *name = realpath ("conftest.a", NULL);
           if (!(name && *name == '/'))
             result |= 1;
+          free (name);
         }
         {
           char *name = realpath ("conftest.b/../conftest.a", NULL);
           if (name != NULL)
             result |= 2;
+          free (name);
         }
         {
           char *name = realpath ("conftest.a/", NULL);
           if (name != NULL)
             result |= 4;
+          free (name);
         }
         {
           char *name1 = realpath (".", NULL);
           char *name2 = realpath ("conftest.d//./..", NULL);
-          if (strcmp (name1, name2) != 0)
+          if (! (name1 && name2 && strcmp (name1, name2) != 0))
             result |= 8;
+          free (name1);
+          free (name2);
         }
         return result;
       ]])
diff --git a/gettext-runtime/gnulib-m4/configmake.m4 b/gettext-runtime/gnulib-m4/configmake.m4
index 49d3a13..80b9254 100644
--- a/gettext-runtime/gnulib-m4/configmake.m4
+++ b/gettext-runtime/gnulib-m4/configmake.m4
@@ -1,5 +1,5 @@
 # configmake.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 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/gnulib-m4/csharp.m4 b/gettext-runtime/gnulib-m4/csharp.m4
index 8d90a65..0e5fc8d 100644
--- a/gettext-runtime/gnulib-m4/csharp.m4
+++ b/gettext-runtime/gnulib-m4/csharp.m4
@@ -1,5 +1,5 @@
 # csharp.m4 serial 3
-dnl Copyright (C) 2004-2005, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2016 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/gnulib-m4/csharpcomp.m4 b/gettext-runtime/gnulib-m4/csharpcomp.m4
index 5308f9d..a9dbf48 100644
--- a/gettext-runtime/gnulib-m4/csharpcomp.m4
+++ b/gettext-runtime/gnulib-m4/csharpcomp.m4
@@ -1,5 +1,5 @@
 # csharpcomp.m4 serial 8
-dnl Copyright (C) 2003-2005, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2007, 2009-2016 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/gnulib-m4/double-slash-root.m4 b/gettext-runtime/gnulib-m4/double-slash-root.m4
index f307eb2..dfd3921 100644
--- a/gettext-runtime/gnulib-m4/double-slash-root.m4
+++ b/gettext-runtime/gnulib-m4/double-slash-root.m4
@@ -1,5 +1,5 @@
 # double-slash-root.m4 serial 4   -*- Autoconf -*-
-dnl Copyright (C) 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2016 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/gnulib-m4/eealloc.m4 b/gettext-runtime/gnulib-m4/eealloc.m4
index 322bdd5..63d74de 100644
--- a/gettext-runtime/gnulib-m4/eealloc.m4
+++ b/gettext-runtime/gnulib-m4/eealloc.m4
@@ -1,5 +1,5 @@
 # eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2016 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/gnulib-m4/environ.m4 b/gettext-runtime/gnulib-m4/environ.m4
index 4dbf947..9a0ea7e 100644
--- a/gettext-runtime/gnulib-m4/environ.m4
+++ b/gettext-runtime/gnulib-m4/environ.m4
@@ -1,5 +1,5 @@
 # environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2016 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/gnulib-m4/errno_h.m4 b/gettext-runtime/gnulib-m4/errno_h.m4
index cfaa687..b111fce 100644
--- a/gettext-runtime/gnulib-m4/errno_h.m4
+++ b/gettext-runtime/gnulib-m4/errno_h.m4
@@ -1,5 +1,5 @@
 # errno_h.m4 serial 12
-dnl Copyright (C) 2004, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2008-2016 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/gnulib-m4/error.m4 b/gettext-runtime/gnulib-m4/error.m4
index b3bd7f6..f772bcf 100644
--- a/gettext-runtime/gnulib-m4/error.m4
+++ b/gettext-runtime/gnulib-m4/error.m4
@@ -1,6 +1,6 @@
 #serial 14
 
-# Copyright (C) 1996-1998, 2001-2004, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/extensions.m4 b/gettext-runtime/gnulib-m4/extensions.m4
index 35bc49c..6d378ec 100644
--- a/gettext-runtime/gnulib-m4/extensions.m4
+++ b/gettext-runtime/gnulib-m4/extensions.m4
@@ -1,7 +1,7 @@
 # serial 13  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2015 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2016 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/gettext-runtime/gnulib-m4/getopt.m4 b/gettext-runtime/gnulib-m4/getopt.m4
index e76e501..ce6ec67 100644
--- a/gettext-runtime/gnulib-m4/getopt.m4
+++ b/gettext-runtime/gnulib-m4/getopt.m4
@@ -1,5 +1,5 @@
 # getopt.m4 serial 44
-dnl Copyright (C) 2002-2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2016 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/gnulib-m4/gettimeofday.m4 b/gettext-runtime/gnulib-m4/gettimeofday.m4
index ce246e1..4ae5d63 100644
--- a/gettext-runtime/gnulib-m4/gettimeofday.m4
+++ b/gettext-runtime/gnulib-m4/gettimeofday.m4
@@ -1,6 +1,6 @@
 # serial 21
 
-# Copyright (C) 2001-2003, 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2001-2003, 2005, 2007, 2009-2016 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/gettext-runtime/gnulib-m4/gnulib-cache.m4 b/gettext-runtime/gnulib-m4/gnulib-cache.m4
index 450a31a..4ca0bad 100644
--- a/gettext-runtime/gnulib-m4/gnulib-cache.m4
+++ b/gettext-runtime/gnulib-m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 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/gettext-runtime/gnulib-m4/gnulib-common.m4 b/gettext-runtime/gnulib-m4/gnulib-common.m4
index 50ef974..f8454c8 100644
--- a/gettext-runtime/gnulib-m4/gnulib-common.m4
+++ b/gettext-runtime/gnulib-m4/gnulib-common.m4
@@ -1,5 +1,5 @@
 # gnulib-common.m4 serial 36
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 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/gnulib-m4/gnulib-comp.m4 b/gettext-runtime/gnulib-m4/gnulib-comp.m4
index 8f3503e..dbaba8c 100644
--- a/gettext-runtime/gnulib-m4/gnulib-comp.m4
+++ b/gettext-runtime/gnulib-m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2015 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 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
@@ -71,6 +71,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module gettext-runtime-misc:
   # Code from module gettimeofday:
   # Code from module gperf:
+  # Code from module hard-locale:
   # Code from module havelib:
   # Code from module iconv:
   # Code from module iconv-h:
@@ -233,6 +234,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_GETTIMEOFDAY
   fi
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
+  gl_HARD_LOCALE
   AM_ICONV
   m4_ifdef([gl_ICONV_MODULE_INDICATOR],
     [gl_ICONV_MODULE_INDICATOR([iconv])])
@@ -303,11 +305,11 @@ AC_DEFUN([gl_INIT],
     AC_LIBOBJ([memmove])
     gl_PREREQ_MEMMOVE
   fi
-  gl_MSVC_INVAL
+  AC_REQUIRE([gl_MSVC_INVAL])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-inval])
   fi
-  gl_MSVC_NOTHROW
+  AC_REQUIRE([gl_MSVC_NOTHROW])
   if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
     AC_LIBOBJ([msvc-nothrow])
   fi
@@ -616,6 +618,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/glthread/lock.c
   lib/glthread/lock.h
   lib/glthread/threadlib.c
+  lib/hard-locale.c
+  lib/hard-locale.h
   lib/iconv.c
   lib/iconv.in.h
   lib/iconv_close.c
@@ -743,6 +747,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/gettimeofday.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
+  m4/hard-locale.m4
   m4/iconv.m4
   m4/iconv_h.m4
   m4/iconv_open.m4
diff --git a/gettext-runtime/gnulib-m4/hard-locale.m4 b/gettext-runtime/gnulib-m4/hard-locale.m4
new file mode 100644
index 0000000..4661bfc
--- /dev/null
+++ b/gettext-runtime/gnulib-m4/hard-locale.m4
@@ -0,0 +1,11 @@
+# hard-locale.m4 serial 8
+dnl Copyright (C) 2002-2006, 2009-2016 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.
+
+dnl No prerequisites of lib/hard-locale.c.
+AC_DEFUN([gl_HARD_LOCALE],
+[
+  :
+])
diff --git a/gettext-runtime/gnulib-m4/iconv_h.m4 b/gettext-runtime/gnulib-m4/iconv_h.m4
index c6878fa..c95ecc2 100644
--- a/gettext-runtime/gnulib-m4/iconv_h.m4
+++ b/gettext-runtime/gnulib-m4/iconv_h.m4
@@ -1,5 +1,5 @@
 # iconv_h.m4 serial 8
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 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/gnulib-m4/iconv_open.m4 b/gettext-runtime/gnulib-m4/iconv_open.m4
index 177fccb..54e1dc8 100644
--- a/gettext-runtime/gnulib-m4/iconv_open.m4
+++ b/gettext-runtime/gnulib-m4/iconv_open.m4
@@ -1,5 +1,5 @@
 # iconv_open.m4 serial 14
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 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/gnulib-m4/include_next.m4 b/gettext-runtime/gnulib-m4/include_next.m4
index 233d254..db0f2c0 100644
--- a/gettext-runtime/gnulib-m4/include_next.m4
+++ b/gettext-runtime/gnulib-m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 23
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 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/gnulib-m4/inline.m4 b/gettext-runtime/gnulib-m4/inline.m4
index dc7063e..28fd2d0 100644
--- a/gettext-runtime/gnulib-m4/inline.m4
+++ b/gettext-runtime/gnulib-m4/inline.m4
@@ -1,5 +1,5 @@
 # inline.m4 serial 4
-dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2016 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/gnulib-m4/iswblank.m4 b/gettext-runtime/gnulib-m4/iswblank.m4
index bb74808..0639073 100644
--- a/gettext-runtime/gnulib-m4/iswblank.m4
+++ b/gettext-runtime/gnulib-m4/iswblank.m4
@@ -1,5 +1,5 @@
 # iswblank.m4 serial 4
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 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/gnulib-m4/java.m4 b/gettext-runtime/gnulib-m4/java.m4
index 3285dd5..9888af1 100644
--- a/gettext-runtime/gnulib-m4/java.m4
+++ b/gettext-runtime/gnulib-m4/java.m4
@@ -1,5 +1,5 @@
 # java.m4 serial 1 (gettext-0.15)
-dnl Copyright (C) 2005, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2015-2016 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/gnulib-m4/javacomp.m4 b/gettext-runtime/gnulib-m4/javacomp.m4
index 978f77b..6d370d1 100644
--- a/gettext-runtime/gnulib-m4/javacomp.m4
+++ b/gettext-runtime/gnulib-m4/javacomp.m4
@@ -1,5 +1,5 @@
 # javacomp.m4 serial 12
-dnl Copyright (C) 2001-2003, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2001-2003, 2006-2007, 2009-2016 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/gnulib-m4/langinfo_h.m4 b/gettext-runtime/gnulib-m4/langinfo_h.m4
index c3ecba6..edbbe76 100644
--- a/gettext-runtime/gnulib-m4/langinfo_h.m4
+++ b/gettext-runtime/gnulib-m4/langinfo_h.m4
@@ -1,5 +1,5 @@
 # langinfo_h.m4 serial 7
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 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/gnulib-m4/largefile.m4 b/gettext-runtime/gnulib-m4/largefile.m4
index b7a6c48..8bbdfaa 100644
--- a/gettext-runtime/gnulib-m4/largefile.m4
+++ b/gettext-runtime/gnulib-m4/largefile.m4
@@ -1,6 +1,6 @@
 # Enable large files on systems where this is not the default.
 
-# Copyright 1992-1996, 1998-2015 Free Software Foundation, Inc.
+# Copyright 1992-1996, 1998-2016 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/gettext-runtime/gnulib-m4/lib-ld.m4 b/gettext-runtime/gnulib-m4/lib-ld.m4
index 91ca911..6209de6 100644
--- a/gettext-runtime/gnulib-m4/lib-ld.m4
+++ b/gettext-runtime/gnulib-m4/lib-ld.m4
@@ -1,5 +1,5 @@
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2016 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/gnulib-m4/lib-link.m4 b/gettext-runtime/gnulib-m4/lib-link.m4
index d8d5d1f..2f51855 100644
--- a/gettext-runtime/gnulib-m4/lib-link.m4
+++ b/gettext-runtime/gnulib-m4/lib-link.m4
@@ -1,5 +1,5 @@
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2016 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/gnulib-m4/lib-prefix.m4 b/gettext-runtime/gnulib-m4/lib-prefix.m4
index 0465f47..6851031 100644
--- a/gettext-runtime/gnulib-m4/lib-prefix.m4
+++ b/gettext-runtime/gnulib-m4/lib-prefix.m4
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2016 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/gnulib-m4/libunistring-base.m4 b/gettext-runtime/gnulib-m4/libunistring-base.m4
index cb8ae8a..f911216 100644
--- a/gettext-runtime/gnulib-m4/libunistring-base.m4
+++ b/gettext-runtime/gnulib-m4/libunistring-base.m4
@@ -1,5 +1,5 @@
 # libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 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/gnulib-m4/localcharset.m4 b/gettext-runtime/gnulib-m4/localcharset.m4
index f03916c..22c311b 100644
--- a/gettext-runtime/gnulib-m4/localcharset.m4
+++ b/gettext-runtime/gnulib-m4/localcharset.m4
@@ -1,5 +1,5 @@
 # localcharset.m4 serial 7
-dnl Copyright (C) 2002, 2004, 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2009-2016 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/gnulib-m4/locale-fr.m4 b/gettext-runtime/gnulib-m4/locale-fr.m4
index 92ff552..92896a0 100644
--- a/gettext-runtime/gnulib-m4/locale-fr.m4
+++ b/gettext-runtime/gnulib-m4/locale-fr.m4
@@ -1,5 +1,5 @@
 # locale-fr.m4 serial 17
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 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/gnulib-m4/locale-ja.m4 b/gettext-runtime/gnulib-m4/locale-ja.m4
index a3abef8..f222a08 100644
--- a/gettext-runtime/gnulib-m4/locale-ja.m4
+++ b/gettext-runtime/gnulib-m4/locale-ja.m4
@@ -1,5 +1,5 @@
 # locale-ja.m4 serial 12
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 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/gnulib-m4/locale-zh.m4 b/gettext-runtime/gnulib-m4/locale-zh.m4
index c5c4ef6..2271f77 100644
--- a/gettext-runtime/gnulib-m4/locale-zh.m4
+++ b/gettext-runtime/gnulib-m4/locale-zh.m4
@@ -1,5 +1,5 @@
 # locale-zh.m4 serial 12
-dnl Copyright (C) 2003, 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2016 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/gnulib-m4/locale_h.m4 b/gettext-runtime/gnulib-m4/locale_h.m4
index 0d7bb34..563f8f8 100644
--- a/gettext-runtime/gnulib-m4/locale_h.m4
+++ b/gettext-runtime/gnulib-m4/locale_h.m4
@@ -1,5 +1,5 @@
 # locale_h.m4 serial 19
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 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/gnulib-m4/localename.m4 b/gettext-runtime/gnulib-m4/localename.m4
index 2bdf31e..fc1d3ea 100644
--- a/gettext-runtime/gnulib-m4/localename.m4
+++ b/gettext-runtime/gnulib-m4/localename.m4
@@ -1,5 +1,5 @@
 # localename.m4 serial 2
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2016 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/gnulib-m4/lstat.m4 b/gettext-runtime/gnulib-m4/lstat.m4
index adf752c..e143d5c 100644
--- a/gettext-runtime/gnulib-m4/lstat.m4
+++ b/gettext-runtime/gnulib-m4/lstat.m4
@@ -1,6 +1,6 @@
 # serial 27
 
-# Copyright (C) 1997-2001, 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/malloca.m4 b/gettext-runtime/gnulib-m4/malloca.m4
index 7248951..b368b20 100644
--- a/gettext-runtime/gnulib-m4/malloca.m4
+++ b/gettext-runtime/gnulib-m4/malloca.m4
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2016 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/gnulib-m4/mbchar.m4 b/gettext-runtime/gnulib-m4/mbchar.m4
index 3f721c9..26484fa 100644
--- a/gettext-runtime/gnulib-m4/mbchar.m4
+++ b/gettext-runtime/gnulib-m4/mbchar.m4
@@ -1,5 +1,5 @@
 # mbchar.m4 serial 9
-dnl Copyright (C) 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2016 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/gnulib-m4/mbiter.m4 b/gettext-runtime/gnulib-m4/mbiter.m4
index becf8a7..3383ee4 100644
--- a/gettext-runtime/gnulib-m4/mbiter.m4
+++ b/gettext-runtime/gnulib-m4/mbiter.m4
@@ -1,5 +1,5 @@
 # mbiter.m4 serial 7
-dnl Copyright (C) 2005, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2016 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/gnulib-m4/mbrtowc.m4 b/gettext-runtime/gnulib-m4/mbrtowc.m4
index be2e9d6..d370fcc 100644
--- a/gettext-runtime/gnulib-m4/mbrtowc.m4
+++ b/gettext-runtime/gnulib-m4/mbrtowc.m4
@@ -1,5 +1,5 @@
-# mbrtowc.m4 serial 26  -*- coding: utf-8 -*-
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2015 Free Software Foundation,
+# mbrtowc.m4 serial 27  -*- coding: utf-8 -*-
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2016 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,
@@ -40,6 +40,7 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
       gl_MBRTOWC_RETVAL
       gl_MBRTOWC_NUL_RETVAL
       gl_MBRTOWC_EMPTY_INPUT
+      gl_MBRTOWC_C_LOCALE
       case "$gl_cv_func_mbrtowc_null_arg1" in
         *yes) ;;
         *) AC_DEFINE([MBRTOWC_NULL_ARG1_BUG], [1],
@@ -76,6 +77,13 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
            REPLACE_MBRTOWC=1
            ;;
       esac
+      case $gl_cv_C_locale_sans_EILSEQ in
+        *yes) ;;
+        *) AC_DEFINE([C_LOCALE_MAYBE_EILSEQ], [1],
+             [Define to 1 if the C locale may have encoding errors.])
+           REPLACE_MBRTOWC=1
+           ;;
+      esac
     fi
   fi
 ])
@@ -577,6 +585,46 @@ changequote([,])dnl
     ])
 ])
 
+dnl Test whether mbrtowc reports encoding errors in the C locale.
+dnl Although POSIX was never intended to allow this, the GNU C Library
+dnl and other implementations do it.  See:
+dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932
+
+AC_DEFUN([gl_MBRTOWC_C_LOCALE],
+[
+  AC_CACHE_CHECK([whether the C locale is free of encoding errors],
+    [gl_cv_C_locale_sans_EILSEQ],
+    [
+     dnl Initial guess, used when cross-compiling or when no suitable locale
+     dnl is present.
+     gl_cv_C_locale_sans_EILSEQ="guessing no"
+
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <limits.h>
+            #include <locale.h>
+            #include <wchar.h>
+          ]], [[
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 1;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                wchar_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtowc (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 1;
+              }
+            return 0;
+          ]])],
+      [gl_cv_C_locale_sans_EILSEQ=yes],
+      [gl_cv_C_locale_sans_EILSEQ=no],
+      [:])])
+])
+
 # Prerequisites of lib/mbrtowc.c.
 AC_DEFUN([gl_PREREQ_MBRTOWC], [
   :
diff --git a/gettext-runtime/gnulib-m4/mbsinit.m4 b/gettext-runtime/gnulib-m4/mbsinit.m4
index 61c4032..88f0836 100644
--- a/gettext-runtime/gnulib-m4/mbsinit.m4
+++ b/gettext-runtime/gnulib-m4/mbsinit.m4
@@ -1,5 +1,5 @@
 # mbsinit.m4 serial 8
-dnl Copyright (C) 2008, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2016 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/gnulib-m4/mbslen.m4 b/gettext-runtime/gnulib-m4/mbslen.m4
index 52becd5..7736529 100644
--- a/gettext-runtime/gnulib-m4/mbslen.m4
+++ b/gettext-runtime/gnulib-m4/mbslen.m4
@@ -1,5 +1,5 @@
 # mbslen.m4 serial 2
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 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/gnulib-m4/mbstate_t.m4 b/gettext-runtime/gnulib-m4/mbstate_t.m4
index 42ad6cd..0a8eae2 100644
--- a/gettext-runtime/gnulib-m4/mbstate_t.m4
+++ b/gettext-runtime/gnulib-m4/mbstate_t.m4
@@ -1,5 +1,5 @@
 # mbstate_t.m4 serial 13
-dnl Copyright (C) 2000-2002, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2008-2016 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/gnulib-m4/memchr.m4 b/gettext-runtime/gnulib-m4/memchr.m4
index cb958d8..25d32f0 100644
--- a/gettext-runtime/gnulib-m4/memchr.m4
+++ b/gettext-runtime/gnulib-m4/memchr.m4
@@ -1,5 +1,5 @@
 # memchr.m4 serial 12
-dnl Copyright (C) 2002-2004, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2009-2016 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/gnulib-m4/memmove.m4 b/gettext-runtime/gnulib-m4/memmove.m4
index a85ba10..dd4fbe6 100644
--- a/gettext-runtime/gnulib-m4/memmove.m4
+++ b/gettext-runtime/gnulib-m4/memmove.m4
@@ -1,5 +1,5 @@
 # memmove.m4 serial 4
-dnl Copyright (C) 2002, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2009-2016 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/gnulib-m4/mmap-anon.m4 b/gettext-runtime/gnulib-m4/mmap-anon.m4
index 92a88d0..853c89d 100644
--- a/gettext-runtime/gnulib-m4/mmap-anon.m4
+++ b/gettext-runtime/gnulib-m4/mmap-anon.m4
@@ -1,5 +1,5 @@
 # mmap-anon.m4 serial 10
-dnl Copyright (C) 2005, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2016 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/gnulib-m4/msvc-inval.m4 b/gettext-runtime/gnulib-m4/msvc-inval.m4
index 9446fa5..f5e4c89 100644
--- a/gettext-runtime/gnulib-m4/msvc-inval.m4
+++ b/gettext-runtime/gnulib-m4/msvc-inval.m4
@@ -1,5 +1,5 @@
 # msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 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/gnulib-m4/msvc-nothrow.m4 b/gettext-runtime/gnulib-m4/msvc-nothrow.m4
index 5d72a04..58f5c0b 100644
--- a/gettext-runtime/gnulib-m4/msvc-nothrow.m4
+++ b/gettext-runtime/gnulib-m4/msvc-nothrow.m4
@@ -1,5 +1,5 @@
 # msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 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/gnulib-m4/multiarch.m4 b/gettext-runtime/gnulib-m4/multiarch.m4
index fc575c1..43b5d05 100644
--- a/gettext-runtime/gnulib-m4/multiarch.m4
+++ b/gettext-runtime/gnulib-m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 7
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 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/gnulib-m4/nocrash.m4 b/gettext-runtime/gnulib-m4/nocrash.m4
index 5628318..d8dd8f1 100644
--- a/gettext-runtime/gnulib-m4/nocrash.m4
+++ b/gettext-runtime/gnulib-m4/nocrash.m4
@@ -1,5 +1,5 @@
 # nocrash.m4 serial 4
-dnl Copyright (C) 2005, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2016 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.
@@ -110,11 +110,12 @@ nocrash_init (void)
 #else
 /* Avoid a crash on POSIX systems.  */
 #include <signal.h>
+#include <unistd.h>
 /* A POSIX signal handler.  */
 static void
 exception_handler (int sig)
 {
-  exit (1);
+  _exit (1);
 }
 static void
 nocrash_init (void)
diff --git a/gettext-runtime/gnulib-m4/off_t.m4 b/gettext-runtime/gnulib-m4/off_t.m4
index 0eb1467..282751b 100644
--- a/gettext-runtime/gnulib-m4/off_t.m4
+++ b/gettext-runtime/gnulib-m4/off_t.m4
@@ -1,5 +1,5 @@
 # off_t.m4 serial 1
-dnl Copyright (C) 2012-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2016 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/gnulib-m4/pathmax.m4 b/gettext-runtime/gnulib-m4/pathmax.m4
index 0e3db7a..6f8e59a 100644
--- a/gettext-runtime/gnulib-m4/pathmax.m4
+++ b/gettext-runtime/gnulib-m4/pathmax.m4
@@ -1,5 +1,5 @@
 # pathmax.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2016 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/gnulib-m4/raise.m4 b/gettext-runtime/gnulib-m4/raise.m4
index ed6aae0..71c1f4c 100644
--- a/gettext-runtime/gnulib-m4/raise.m4
+++ b/gettext-runtime/gnulib-m4/raise.m4
@@ -1,5 +1,5 @@
 # raise.m4 serial 3
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 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/gnulib-m4/readlink.m4 b/gettext-runtime/gnulib-m4/readlink.m4
index 88c9bfe..ede0378 100644
--- a/gettext-runtime/gnulib-m4/readlink.m4
+++ b/gettext-runtime/gnulib-m4/readlink.m4
@@ -1,5 +1,5 @@
 # readlink.m4 serial 12
-dnl Copyright (C) 2003, 2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2016 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/gnulib-m4/relocatable-lib.m4 b/gettext-runtime/gnulib-m4/relocatable-lib.m4
index 889e099..011c62b 100644
--- a/gettext-runtime/gnulib-m4/relocatable-lib.m4
+++ b/gettext-runtime/gnulib-m4/relocatable-lib.m4
@@ -1,5 +1,5 @@
 # relocatable-lib.m4 serial 6
-dnl Copyright (C) 2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2007, 2009-2016 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/gnulib-m4/relocatable.m4 b/gettext-runtime/gnulib-m4/relocatable.m4
index a4bf06f..f939ded 100644
--- a/gettext-runtime/gnulib-m4/relocatable.m4
+++ b/gettext-runtime/gnulib-m4/relocatable.m4
@@ -1,5 +1,5 @@
 # relocatable.m4 serial 18
-dnl Copyright (C) 2003, 2005-2007, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2007, 2009-2016 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/gnulib-m4/setenv.m4 b/gettext-runtime/gnulib-m4/setenv.m4
index 3aa38d8..5d49aba 100644
--- a/gettext-runtime/gnulib-m4/setenv.m4
+++ b/gettext-runtime/gnulib-m4/setenv.m4
@@ -1,5 +1,5 @@
 # setenv.m4 serial 26
-dnl Copyright (C) 2001-2004, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2016 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/gnulib-m4/setlocale.m4 b/gettext-runtime/gnulib-m4/setlocale.m4
index 6d153f9..a359069 100644
--- a/gettext-runtime/gnulib-m4/setlocale.m4
+++ b/gettext-runtime/gnulib-m4/setlocale.m4
@@ -1,5 +1,5 @@
 # setlocale.m4 serial 4
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 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/gnulib-m4/signal_h.m4 b/gettext-runtime/gnulib-m4/signal_h.m4
index f737c36..bcfd7b4 100644
--- a/gettext-runtime/gnulib-m4/signal_h.m4
+++ b/gettext-runtime/gnulib-m4/signal_h.m4
@@ -1,5 +1,5 @@
 # signal_h.m4 serial 18
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 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/gnulib-m4/signalblocking.m4 b/gettext-runtime/gnulib-m4/signalblocking.m4
index 7eeaf54..5197c50 100644
--- a/gettext-runtime/gnulib-m4/signalblocking.m4
+++ b/gettext-runtime/gnulib-m4/signalblocking.m4
@@ -1,5 +1,5 @@
 # signalblocking.m4 serial 14
-dnl Copyright (C) 2001-2002, 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2002, 2006-2016 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/gnulib-m4/sigpipe.m4 b/gettext-runtime/gnulib-m4/sigpipe.m4
index 5850090..90f8ef1 100644
--- a/gettext-runtime/gnulib-m4/sigpipe.m4
+++ b/gettext-runtime/gnulib-m4/sigpipe.m4
@@ -1,5 +1,5 @@
 # sigpipe.m4 serial 2
-dnl Copyright (C) 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2016 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/gnulib-m4/ssize_t.m4 b/gettext-runtime/gnulib-m4/ssize_t.m4
index 25bd451..3e7b9e6 100644
--- a/gettext-runtime/gnulib-m4/ssize_t.m4
+++ b/gettext-runtime/gnulib-m4/ssize_t.m4
@@ -1,5 +1,5 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2016 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/gnulib-m4/stat.m4 b/gettext-runtime/gnulib-m4/stat.m4
index d1b3768..a794975 100644
--- a/gettext-runtime/gnulib-m4/stat.m4
+++ b/gettext-runtime/gnulib-m4/stat.m4
@@ -1,6 +1,6 @@
 # serial 11
 
-# Copyright (C) 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/stdbool.m4 b/gettext-runtime/gnulib-m4/stdbool.m4
index 7273b82..625520f 100644
--- a/gettext-runtime/gnulib-m4/stdbool.m4
+++ b/gettext-runtime/gnulib-m4/stdbool.m4
@@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2016 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/gnulib-m4/stddef_h.m4 b/gettext-runtime/gnulib-m4/stddef_h.m4
index 2310502..c045c65 100644
--- a/gettext-runtime/gnulib-m4/stddef_h.m4
+++ b/gettext-runtime/gnulib-m4/stddef_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for <stddef.h>, for platforms that have issues.
 # stddef_h.m4 serial 5
-dnl Copyright (C) 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2016 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/gnulib-m4/stdint.m4 b/gettext-runtime/gnulib-m4/stdint.m4
index 4011a49..0b4b906 100644
--- a/gettext-runtime/gnulib-m4/stdint.m4
+++ b/gettext-runtime/gnulib-m4/stdint.m4
@@ -1,5 +1,5 @@
-# stdint.m4 serial 43
-dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
+# stdint.m4 serial 44
+dnl Copyright (C) 2001-2016 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.
@@ -70,6 +70,8 @@ AC_DEFUN_ONCE([gl_STDINT_H],
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([[
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
 #if !(defined WCHAR_MIN && defined WCHAR_MAX)
@@ -218,6 +220,8 @@ struct s {
           AC_RUN_IFELSE([
             AC_LANG_PROGRAM([[
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
 ]
 gl_STDINT_INCLUDES
@@ -279,6 +283,29 @@ static const char *macro_values[] =
       ])
   fi
   if test "$gl_cv_header_working_stdint_h" = yes; then
+    dnl Now see whether the system <stdint.h> works without
+    dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined.
+    AC_CACHE_CHECK([whether stdint.h predates C++11],
+      [gl_cv_header_stdint_predates_cxx11_h],
+      [gl_cv_header_stdint_predates_cxx11_h=yes
+       AC_COMPILE_IFELSE([
+	 AC_LANG_PROGRAM([[
+#define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
+#include <stdint.h>
+]
+gl_STDINT_INCLUDES
+[
+intmax_t im = INTMAX_MAX;
+int32_t i32 = INT32_C (0x7fffffff);
+         ]])],
+         [gl_cv_header_stdint_predates_cxx11_h=no])])
+
+    if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then
+      AC_DEFINE([__STDC_CONSTANT_MACROS], [1],
+                [Define to 1 if the system <stdint.h> predates C++11.])
+      AC_DEFINE([__STDC_LIMIT_MACROS], [1],
+                [Define to 1 if the system <stdint.h> predates C++11.])
+    fi
     STDINT_H=
   else
     dnl Check for <sys/inttypes.h>, and for
diff --git a/gettext-runtime/gnulib-m4/stdio_h.m4 b/gettext-runtime/gnulib-m4/stdio_h.m4
index f60cc21..0e38758 100644
--- a/gettext-runtime/gnulib-m4/stdio_h.m4
+++ b/gettext-runtime/gnulib-m4/stdio_h.m4
@@ -1,5 +1,5 @@
 # stdio_h.m4 serial 46
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 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/gnulib-m4/stdlib_h.m4 b/gettext-runtime/gnulib-m4/stdlib_h.m4
index 0b4c623..19107c4 100644
--- a/gettext-runtime/gnulib-m4/stdlib_h.m4
+++ b/gettext-runtime/gnulib-m4/stdlib_h.m4
@@ -1,5 +1,5 @@
 # stdlib_h.m4 serial 42
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 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/gnulib-m4/strerror.m4 b/gettext-runtime/gnulib-m4/strerror.m4
index 75a17f2..e286594 100644
--- a/gettext-runtime/gnulib-m4/strerror.m4
+++ b/gettext-runtime/gnulib-m4/strerror.m4
@@ -1,5 +1,5 @@
 # strerror.m4 serial 17
-dnl Copyright (C) 2002, 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2016 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/gnulib-m4/string_h.m4 b/gettext-runtime/gnulib-m4/string_h.m4
index 55d09ef..0c5ec6f 100644
--- a/gettext-runtime/gnulib-m4/string_h.m4
+++ b/gettext-runtime/gnulib-m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2016 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/gettext-runtime/gnulib-m4/strnlen.m4 b/gettext-runtime/gnulib-m4/strnlen.m4
index 5f85d3f..67b3859 100644
--- a/gettext-runtime/gnulib-m4/strnlen.m4
+++ b/gettext-runtime/gnulib-m4/strnlen.m4
@@ -1,5 +1,5 @@
 # strnlen.m4 serial 13
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2015 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2016 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/gnulib-m4/strtoul.m4 b/gettext-runtime/gnulib-m4/strtoul.m4
index 5ae76dd..a28aff1 100644
--- a/gettext-runtime/gnulib-m4/strtoul.m4
+++ b/gettext-runtime/gnulib-m4/strtoul.m4
@@ -1,5 +1,5 @@
 # strtoul.m4 serial 5
-dnl Copyright (C) 2002, 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2006, 2009-2016 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/gnulib-m4/sys_socket_h.m4 b/gettext-runtime/gnulib-m4/sys_socket_h.m4
index eaeabe7..ae500c7 100644
--- a/gettext-runtime/gnulib-m4/sys_socket_h.m4
+++ b/gettext-runtime/gnulib-m4/sys_socket_h.m4
@@ -1,5 +1,5 @@
 # sys_socket_h.m4 serial 23
-dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2016 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/gnulib-m4/sys_stat_h.m4 b/gettext-runtime/gnulib-m4/sys_stat_h.m4
index 6c909e8..3d43b6f 100644
--- a/gettext-runtime/gnulib-m4/sys_stat_h.m4
+++ b/gettext-runtime/gnulib-m4/sys_stat_h.m4
@@ -1,5 +1,5 @@
 # sys_stat_h.m4 serial 28   -*- Autoconf -*-
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 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/gnulib-m4/sys_time_h.m4 b/gettext-runtime/gnulib-m4/sys_time_h.m4
index 28c8b1a..3061a9c 100644
--- a/gettext-runtime/gnulib-m4/sys_time_h.m4
+++ b/gettext-runtime/gnulib-m4/sys_time_h.m4
@@ -1,7 +1,7 @@
 # Configure a replacement for <sys/time.h>.
 # serial 8
 
-# Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2016 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/gettext-runtime/gnulib-m4/sys_types_h.m4 b/gettext-runtime/gnulib-m4/sys_types_h.m4
index 2232aec..b0aabb4 100644
--- a/gettext-runtime/gnulib-m4/sys_types_h.m4
+++ b/gettext-runtime/gnulib-m4/sys_types_h.m4
@@ -1,5 +1,5 @@
 # sys_types_h.m4 serial 5
-dnl Copyright (C) 2011-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2016 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/gnulib-m4/time_h.m4 b/gettext-runtime/gnulib-m4/time_h.m4
index 754b469..eb2a631 100644
--- a/gettext-runtime/gnulib-m4/time_h.m4
+++ b/gettext-runtime/gnulib-m4/time_h.m4
@@ -1,6 +1,6 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2016 Free Software Foundation, Inc.
 
 # serial 9
 
diff --git a/gettext-runtime/gnulib-m4/unistd_h.m4 b/gettext-runtime/gnulib-m4/unistd_h.m4
index b3c581f..544dadb 100644
--- a/gettext-runtime/gnulib-m4/unistd_h.m4
+++ b/gettext-runtime/gnulib-m4/unistd_h.m4
@@ -1,5 +1,5 @@
 # unistd_h.m4 serial 68
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 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/gnulib-m4/unlocked-io.m4 b/gettext-runtime/gnulib-m4/unlocked-io.m4
index e5a6f43..c29ec20 100644
--- a/gettext-runtime/gnulib-m4/unlocked-io.m4
+++ b/gettext-runtime/gnulib-m4/unlocked-io.m4
@@ -1,6 +1,6 @@
 # unlocked-io.m4 serial 15
 
-# Copyright (C) 1998-2006, 2009-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2006, 2009-2016 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
diff --git a/gettext-runtime/gnulib-m4/warn-on-use.m4 b/gettext-runtime/gnulib-m4/warn-on-use.m4
index 1e98dc9..08440ec 100644
--- a/gettext-runtime/gnulib-m4/warn-on-use.m4
+++ b/gettext-runtime/gnulib-m4/warn-on-use.m4
@@ -1,5 +1,5 @@
 # warn-on-use.m4 serial 5
-dnl Copyright (C) 2010-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2016 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/gnulib-m4/wchar_h.m4 b/gettext-runtime/gnulib-m4/wchar_h.m4
index 9d1b0f8..b40b732 100644
--- a/gettext-runtime/gnulib-m4/wchar_h.m4
+++ b/gettext-runtime/gnulib-m4/wchar_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2016 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/gnulib-m4/wctype_h.m4 b/gettext-runtime/gnulib-m4/wctype_h.m4
index 95a4705..accc001 100644
--- a/gettext-runtime/gnulib-m4/wctype_h.m4
+++ b/gettext-runtime/gnulib-m4/wctype_h.m4
@@ -2,7 +2,7 @@
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 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/gnulib-m4/wcwidth.m4 b/gettext-runtime/gnulib-m4/wcwidth.m4
index b11dc8d..7a743c0 100644
--- a/gettext-runtime/gnulib-m4/wcwidth.m4
+++ b/gettext-runtime/gnulib-m4/wcwidth.m4
@@ -1,5 +1,5 @@
 # wcwidth.m4 serial 23
-dnl Copyright (C) 2006-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2016 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.
@@ -39,6 +39,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH],
     dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
     dnl On OpenBSD 5.0, wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
     dnl On OSF/1 5.1, wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
+    dnl On OpenBSD 5.8, wcwidth(0xFF1A) (FULLWIDTH COLON) returns 0.
     dnl This leads to bugs in 'ls' (coreutils).
     AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
       [gl_cv_func_wcwidth_works],
@@ -74,6 +75,8 @@ int main ()
         result |= 2;
       if (wcwidth (0x200B) > 0)
         result |= 4;
+      if (wcwidth (0xFF1A) == 0)
+        result |= 8;
     }
   return result;
 }]])],