gettext-0.19.8.1HEADgettext-0.19.8.1master

64 files changed, 111 insertions, 91 deletions

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 34ebea9..37c801c 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -1,6 +1,5 @@
 ## Makefile for the gnulib-local directory of GNU gettext
-## Copyright (C) 2006-2008, 2010-2011, 2015 Free Software Foundation,
-## Inc.
+## Copyright (C) 2006-2008, 2010-2011, 2015-2016 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
@@ -224,6 +223,7 @@ lib/obstack.h.diff \
 lib/ostream.oo.c \
 lib/ostream.oo.h \
 lib/progname.h.diff \
+lib/regcomp.c.diff \
 lib/regexec.c.diff \
 lib/regex_internal.h.diff \
 lib/spawn-pipe.c.diff \
@@ -249,7 +249,6 @@ m4/alloca.m4 \
 m4/backupfile.m4 \
 m4/curses.m4 \
 m4/gcj.m4 \
-m4/hard-locale.m4.diff \
 m4/libcroco.m4 \
 m4/libglib.m4 \
 m4/libxml.m4 \
diff --git a/gnulib-local/Makefile.in b/gnulib-local/Makefile.in
index 3e2c135..d4c371d 100644
--- a/gnulib-local/Makefile.in
+++ b/gnulib-local/Makefile.in
@@ -426,6 +426,7 @@ lib/obstack.h.diff \
 lib/ostream.oo.c \
 lib/ostream.oo.h \
 lib/progname.h.diff \
+lib/regcomp.c.diff \
 lib/regexec.c.diff \
 lib/regex_internal.h.diff \
 lib/spawn-pipe.c.diff \
@@ -451,7 +452,6 @@ m4/alloca.m4 \
 m4/backupfile.m4 \
 m4/curses.m4 \
 m4/gcj.m4 \
-m4/hard-locale.m4.diff \
 m4/libcroco.m4 \
 m4/libglib.m4 \
 m4/libxml.m4 \
diff --git a/gnulib-local/build-aux/moopp b/gnulib-local/build-aux/moopp
index 96a50a6..c155d93 100755
--- a/gnulib-local/build-aux/moopp
+++ b/gnulib-local/build-aux/moopp
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Minimal Object-Oriented style PreProcessor.
 
-# Copyright (C) 2006-2008, 2015 Free Software Foundation, Inc.
+# Copyright (C) 2006-2008, 2015-2016 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2006.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -306,12 +306,12 @@ func_check_header_syntax ()
   }
   class_end_lineno=`expr $methods_lineno + $class_end_lineno`
   sed_extract_methods="$class_end_lineno"',$d;1,'"$methods_lineno"'d'
-  methods=`sed -e "$sed_remove_comments" < "$file" | sed -e "$sed_extract_methods" | tr '\n' ' ' | tr ';' '\n' | sed -e 's,[ 	]*$,,'`
+  methods=`sed -e "$sed_remove_comments" < "$file" | sed -e "$sed_extract_methods" | tr '\015\n' '  ' | tr ';' '\n' | sed -e 's,[ 	]*$,,'`
   sed_remove_valid_arg1_lines='/([ 	]*'"$classname"'_t[ 	]*[A-Za-z_0-9]*[ 	]*[,)]/d'
   sed_extract_method_name='s,^.*[^A-Za-z_0-9]\([A-Za-z_0-9][A-Za-z_0-9]*\)[ 	]*(.*$,\1,'
   methods_with_bad_arg1=`echo "$methods" | sed -e "$sed_remove_empty_lines" -e "$sed_remove_valid_arg1_lines" -e "$sed_extract_method_name"`
   if test -n "$methods_with_bad_arg1"; then
-    methods_with_bad_arg1=`{ echo "$methods_with_bad_arg1" | sed -e 's/$/, /' | tr -d '\n'; echo; } | sed -e 's/\(, \)*$//'`
+    methods_with_bad_arg1=`{ echo "$methods_with_bad_arg1" | sed -e 's/$/, /' | tr -d '\015\n'; echo; } | sed -e 's/\(, \)*$//'`
     func_fatal_error "$file: some methods don't have a first argument of type ${classname}_t: $methods_with_bad_arg1"
   fi
 }
diff --git a/gnulib-local/lib/addext.c b/gnulib-local/lib/addext.c
index bea586f..9cc64c0 100644
--- a/gnulib-local/lib/addext.c
+++ b/gnulib-local/lib/addext.c
@@ -1,6 +1,6 @@
 /* addext.c -- add an extension to a file name
-   Copyright (C) 1990, 1997-1999, 2001-2003, 2005-2006, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990, 1997-1999, 2001-2003, 2005-2006, 2015-2016 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/gnulib-local/lib/alloca.in.h b/gnulib-local/lib/alloca.in.h
index b334262..8603e79 100644
--- a/gnulib-local/lib/alloca.in.h
+++ b/gnulib-local/lib/alloca.in.h
@@ -1,5 +1,5 @@
 /* Memory allocation on the stack.
-   Copyright (C) 1995, 1999, 2001-2007, 2015 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2007, 2015-2016 Free Software Foundation,
    Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/backupfile.c b/gnulib-local/lib/backupfile.c
index 5ec0228..7d9313f 100644
--- a/gnulib-local/lib/backupfile.c
+++ b/gnulib-local/lib/backupfile.c
@@ -1,5 +1,5 @@
 /* backupfile.c -- make Emacs style backup file names
-   Copyright (C) 1990-2003, 2005-2006, 2012, 2015 Free Software
+   Copyright (C) 1990-2003, 2005-2006, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/backupfile.h b/gnulib-local/lib/backupfile.h
index 91c37fa..279c2fb 100644
--- a/gnulib-local/lib/backupfile.h
+++ b/gnulib-local/lib/backupfile.h
@@ -1,5 +1,5 @@
 /* backupfile.h -- declarations for making Emacs style backup file names
-   Copyright (C) 1990-1992, 1997-1999, 2001-2003, 2015 Free Software
+   Copyright (C) 1990-1992, 1997-1999, 2001-2003, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/basename.c b/gnulib-local/lib/basename.c
index 56421aa..3518ade 100644
--- a/gnulib-local/lib/basename.c
+++ b/gnulib-local/lib/basename.c
@@ -1,5 +1,5 @@
 /* Return the name-within-directory of a file name.
-   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015 Free Software
+   Copyright (C) 1996-2002, 2004, 2006, 2010, 2012, 2015-2016 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/gnulib-local/lib/basename.h b/gnulib-local/lib/basename.h
index 489cc67..2d7f0ad 100644
--- a/gnulib-local/lib/basename.h
+++ b/gnulib-local/lib/basename.h
@@ -1,5 +1,5 @@
 /* Pathname hacking.
-   Copyright (C) 2001-2003, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/closeout.c b/gnulib-local/lib/closeout.c
index a790176..8bba65b 100644
--- a/gnulib-local/lib/closeout.c
+++ b/gnulib-local/lib/closeout.c
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output and standard error
-   Copyright (C) 1998-2007, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2007, 2012, 2015-2016 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/gnulib-local/lib/closeout.h b/gnulib-local/lib/closeout.h
index 896e22f..284d1e7 100644
--- a/gnulib-local/lib/closeout.h
+++ b/gnulib-local/lib/closeout.h
@@ -1,5 +1,5 @@
 /* Close standard output and standard error.
-   Copyright (C) 1998-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1998-2003, 2006, 2015-2016 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/gnulib-local/lib/error-progname.c b/gnulib-local/lib/error-progname.c
index 525d11f..ba2702a 100644
--- a/gnulib-local/lib/error-progname.c
+++ b/gnulib-local/lib/error-progname.c
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/error-progname.h b/gnulib-local/lib/error-progname.h
index f16107a..5b89b71 100644
--- a/gnulib-local/lib/error-progname.h
+++ b/gnulib-local/lib/error-progname.h
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/fd-ostream.oo.c b/gnulib-local/lib/fd-ostream.oo.c
index 64b9597..b4e1e50 100644
--- a/gnulib-local/lib/fd-ostream.oo.c
+++ b/gnulib-local/lib/fd-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream referring to a file descriptor.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/fd-ostream.oo.h b/gnulib-local/lib/fd-ostream.oo.h
index 155b627..6415401 100644
--- a/gnulib-local/lib/fd-ostream.oo.h
+++ b/gnulib-local/lib/fd-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream referring to a file descriptor.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/file-ostream.oo.c b/gnulib-local/lib/file-ostream.oo.c
index a500825..0b19942 100644
--- a/gnulib-local/lib/file-ostream.oo.c
+++ b/gnulib-local/lib/file-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/file-ostream.oo.h b/gnulib-local/lib/file-ostream.oo.h
index 395cef7..8b4fd8b 100644
--- a/gnulib-local/lib/file-ostream.oo.h
+++ b/gnulib-local/lib/file-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream referring to an stdio FILE.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/gettext.h b/gnulib-local/lib/gettext.h
index 7d96228..3d4233c 100644
--- a/gnulib-local/lib/gettext.h
+++ b/gnulib-local/lib/gettext.h
@@ -1,6 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2016 Free Software
+   Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -225,15 +225,17 @@ dcpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcgettext (domain, msg_ctxt_id, category);
+      found_translation = (translation != msg_ctxt_id);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (translation != msg_ctxt_id)
+      if (found_translation)
         return translation;
     }
   return msgid;
@@ -271,15 +273,17 @@ dcnpgettext_expr (const char *domain,
   if (msg_ctxt_id != NULL)
 #endif
     {
+      int found_translation;
       memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1);
       msg_ctxt_id[msgctxt_len - 1] = '\004';
       memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len);
       translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category);
+      found_translation = !(translation == msg_ctxt_id || translation == msgid_plural);
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
       if (msg_ctxt_id != buf)
         free (msg_ctxt_id);
 #endif
-      if (!(translation == msg_ctxt_id || translation == msgid_plural))
+      if (found_translation)
         return translation;
     }
   return (n == 1 ? msgid : msgid_plural);
diff --git a/gnulib-local/lib/glib/gstrfuncs.c b/gnulib-local/lib/glib/gstrfuncs.c
index 8796226..ce692fd 100644
--- a/gnulib-local/lib/glib/gstrfuncs.c
+++ b/gnulib-local/lib/glib/gstrfuncs.c
@@ -621,7 +621,7 @@ g_parse_long_long (const gchar *nptr,
   /* this code is based on on the strtol(3) code from GNU libc released under
    * the GNU Lesser General Public License.
    *
-   * Copyright (C) 1991-1992, 1994-2000, 1901-1902, 2015 Free Software
+   * Copyright (C) 1991-1992, 1994-2000, 1901-1902, 2015-2016 Free Software
    * Foundation, Inc.
    */
 #define ISSPACE(c)		((c) == ' ' || (c) == '\f' || (c) == '\n' || \
diff --git a/gnulib-local/lib/hash.c b/gnulib-local/lib/hash.c
index 89fa5ec..4202f79 100644
--- a/gnulib-local/lib/hash.c
+++ b/gnulib-local/lib/hash.c
@@ -1,6 +1,5 @@
 /* hash - implement simple hashing table with string based keys.
-   Copyright (C) 1994-1995, 2000-2006, 2015 Free Software Foundation,
-   Inc.
+   Copyright (C) 1994-1995, 2000-2006, 2015-2016 Free Software Foundation, Inc.
    Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, October 1994.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/hash.h b/gnulib-local/lib/hash.h
index 0cf972f..f826baf 100644
--- a/gnulib-local/lib/hash.h
+++ b/gnulib-local/lib/hash.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015 Free Software
+/* Copyright (C) 1995, 2000-2003, 2005-2006, 2015-2016 Free Software
  * Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/html-ostream.oo.c b/gnulib-local/lib/html-ostream.oo.c
index afa84d3..be4fd40 100644
--- a/gnulib-local/lib/html-ostream.oo.c
+++ b/gnulib-local/lib/html-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream that produces HTML output.
-   Copyright (C) 2006-2009, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2009, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/html-ostream.oo.h b/gnulib-local/lib/html-ostream.oo.h
index 87c6f3d..d044a78 100644
--- a/gnulib-local/lib/html-ostream.oo.h
+++ b/gnulib-local/lib/html-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream that produces HTML output.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/html-styled-ostream.oo.c b/gnulib-local/lib/html-styled-ostream.oo.c
index ef187dd..7722347 100644
--- a/gnulib-local/lib/html-styled-ostream.oo.c
+++ b/gnulib-local/lib/html-styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing HTML output.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/html-styled-ostream.oo.h b/gnulib-local/lib/html-styled-ostream.oo.h
index d66bb2e..02e7c72 100644
--- a/gnulib-local/lib/html-styled-ostream.oo.h
+++ b/gnulib-local/lib/html-styled-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing HTML output.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/iconv-ostream.oo.c b/gnulib-local/lib/iconv-ostream.oo.c
index a7314fa..8048aec 100644
--- a/gnulib-local/lib/iconv-ostream.oo.c
+++ b/gnulib-local/lib/iconv-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream that converts the output to another encoding.
-   Copyright (C) 2006-2007, 2010, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2010, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/iconv-ostream.oo.h b/gnulib-local/lib/iconv-ostream.oo.h
index 961ad06..d09ec32 100644
--- a/gnulib-local/lib/iconv-ostream.oo.h
+++ b/gnulib-local/lib/iconv-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream that converts the output to another encoding.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/memory-ostream.oo.c b/gnulib-local/lib/memory-ostream.oo.c
index 2468ed5..db08085 100644
--- a/gnulib-local/lib/memory-ostream.oo.c
+++ b/gnulib-local/lib/memory-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream that accumulates the output in memory.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/memory-ostream.oo.h b/gnulib-local/lib/memory-ostream.oo.h
index ae9ef15..125fbb1 100644
--- a/gnulib-local/lib/memory-ostream.oo.h
+++ b/gnulib-local/lib/memory-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream that accumulates the output in memory.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/moo.h b/gnulib-local/lib/moo.h
index f11a2b8..68838b0 100644
--- a/gnulib-local/lib/moo.h
+++ b/gnulib-local/lib/moo.h
@@ -1,5 +1,5 @@
 /* Minimal object-oriented facilities for C.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/ostream.oo.c b/gnulib-local/lib/ostream.oo.c
index 3c178fa..443b03c 100644
--- a/gnulib-local/lib/ostream.oo.c
+++ b/gnulib-local/lib/ostream.oo.c
@@ -1,5 +1,5 @@
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/ostream.oo.h b/gnulib-local/lib/ostream.oo.h
index 87199df..d0882b9 100644
--- a/gnulib-local/lib/ostream.oo.h
+++ b/gnulib-local/lib/ostream.oo.h
@@ -1,5 +1,5 @@
 /* Abstract output stream data type.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/regcomp.c.diff b/gnulib-local/lib/regcomp.c.diff
new file mode 100644
index 0000000..a6ef920
--- /dev/null
+++ b/gnulib-local/lib/regcomp.c.diff
@@ -0,0 +1,22 @@
+diff --git a/regcomp.c b/regcomp.c
+index 6de9b72..1f24938 100644
+--- a/regcomp.c
++++ b/regcomp.c
+@@ -464,7 +464,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
+    the return codes and their meanings.)  */
+ 
+ int
+-regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags)
++regcomp (regex_t *_Restrict_ preg, const char *_Restrict_ pattern, int cflags)
+ {
+   reg_errcode_t ret;
+   reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
+@@ -523,7 +523,7 @@ weak_alias (__regcomp, regcomp)
+    from either regcomp or regexec.   We don't use PREG here.  */
+ 
+ size_t
+-regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf,
++regerror (int errcode, const regex_t *_Restrict_ preg, char *_Restrict_ errbuf,
+ 	  size_t errbuf_size)
+ {
+   const char *msg;
diff --git a/gnulib-local/lib/styled-ostream.oo.c b/gnulib-local/lib/styled-ostream.oo.c
index 03ecbc0..f8522c7 100644
--- a/gnulib-local/lib/styled-ostream.oo.c
+++ b/gnulib-local/lib/styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Abstract output stream for CSS styled text.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/styled-ostream.oo.h b/gnulib-local/lib/styled-ostream.oo.h
index 4e9c8d0..b3c8980 100644
--- a/gnulib-local/lib/styled-ostream.oo.h
+++ b/gnulib-local/lib/styled-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Abstract output stream for CSS styled text.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/term-ostream.oo.c b/gnulib-local/lib/term-ostream.oo.c
index 243619a..165fc33 100644
--- a/gnulib-local/lib/term-ostream.oo.c
+++ b/gnulib-local/lib/term-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for attributed text, producing ANSI escape sequences.
-   Copyright (C) 2006-2008, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2008, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/term-ostream.oo.h b/gnulib-local/lib/term-ostream.oo.h
index 8883b8f..e3e1498 100644
--- a/gnulib-local/lib/term-ostream.oo.h
+++ b/gnulib-local/lib/term-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream for attributed text, producing ANSI escape sequences.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/term-styled-ostream.oo.c b/gnulib-local/lib/term-styled-ostream.oo.c
index 658574b..81a4074 100644
--- a/gnulib-local/lib/term-styled-ostream.oo.c
+++ b/gnulib-local/lib/term-styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing ANSI escape sequences.
-   Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/term-styled-ostream.oo.h b/gnulib-local/lib/term-styled-ostream.oo.h
index 05335ce..f9f84fd 100644
--- a/gnulib-local/lib/term-styled-ostream.oo.h
+++ b/gnulib-local/lib/term-styled-ostream.oo.h
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing ANSI escape sequences.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/termcap.h b/gnulib-local/lib/termcap.h
index 944c63d..14abfd6 100644
--- a/gnulib-local/lib/termcap.h
+++ b/gnulib-local/lib/termcap.h
@@ -1,5 +1,5 @@
 /* Information about terminal capabilities.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/terminfo.h b/gnulib-local/lib/terminfo.h
index 6e412f0..da973fd 100644
--- a/gnulib-local/lib/terminfo.h
+++ b/gnulib-local/lib/terminfo.h
@@ -1,5 +1,5 @@
 /* Information about terminal capabilities.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/tparm.c b/gnulib-local/lib/tparm.c
index 817a691..66f09ea 100644
--- a/gnulib-local/lib/tparm.c
+++ b/gnulib-local/lib/tparm.c
@@ -1,5 +1,5 @@
 /* Substitution of parameters in strings from terminal descriptions.
-   Copyright (C) 2006, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2012, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gnulib-local/lib/tputs.c b/gnulib-local/lib/tputs.c
index 03c07f3..0653f3a 100644
--- a/gnulib-local/lib/tputs.c
+++ b/gnulib-local/lib/tputs.c
@@ -1,5 +1,5 @@
 /* Output of string from terminal descriptions.
-   Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gnulib-local/lib/xalloc.h b/gnulib-local/lib/xalloc.h
index b261994..f4a329e 100644
--- a/gnulib-local/lib/xalloc.h
+++ b/gnulib-local/lib/xalloc.h
@@ -1,5 +1,5 @@
 /* malloc with out of memory checking.
-   Copyright (C) 2001-2004, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/xerror.c b/gnulib-local/lib/xerror.c
index 705b553..3c1e799 100644
--- a/gnulib-local/lib/xerror.c
+++ b/gnulib-local/lib/xerror.c
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/xerror.h b/gnulib-local/lib/xerror.h
index fc8b163..d702c3a 100644
--- a/gnulib-local/lib/xerror.h
+++ b/gnulib-local/lib/xerror.h
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2015-2016 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/xgetcwd.c b/gnulib-local/lib/xgetcwd.c
index d939c63..53c21ab 100644
--- a/gnulib-local/lib/xgetcwd.c
+++ b/gnulib-local/lib/xgetcwd.c
@@ -1,5 +1,5 @@
 /* xgetcwd.c -- return current directory with unlimited length
-   Copyright (C) 1992, 1996, 2000, 2003, 2005-2006, 2011, 2015 Free
+   Copyright (C) 1992, 1996, 2000, 2003, 2005-2006, 2011, 2015-2016 Free
    Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/lib/xgetcwd.h b/gnulib-local/lib/xgetcwd.h
index 8c7e988..c3617ac 100644
--- a/gnulib-local/lib/xgetcwd.h
+++ b/gnulib-local/lib/xgetcwd.h
@@ -1,5 +1,5 @@
 /* xgetcwd -- return current directory with unlimited length
-   Copyright (C) 1995, 2001-2002, 2015 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2002, 2015-2016 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/gnulib-local/lib/xmalloc.c b/gnulib-local/lib/xmalloc.c
index 43dcb94..9d435a5 100644
--- a/gnulib-local/lib/xmalloc.c
+++ b/gnulib-local/lib/xmalloc.c
@@ -1,6 +1,6 @@
 /* xmalloc.c -- malloc with out of memory checking
-   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015 Free
-   Software Foundation, Inc.
+   Copyright (C) 1990-1996, 2000-2003, 2005-2007, 2012, 2015-2016 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/gnulib-local/lib/xstrdup.c b/gnulib-local/lib/xstrdup.c
index 7aa09dc..c7fbe14 100644
--- a/gnulib-local/lib/xstrdup.c
+++ b/gnulib-local/lib/xstrdup.c
@@ -1,5 +1,5 @@
 /* xstrdup.c -- copy a string with out of memory checking
-   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015 Free Software
+   Copyright (C) 1990, 1996, 2000-2003, 2005-2006, 2015-2016 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gnulib-local/m4/alloca.m4 b/gnulib-local/m4/alloca.m4
index c7165e5..64f9a79 100644
--- a/gnulib-local/m4/alloca.m4
+++ b/gnulib-local/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/gnulib-local/m4/backupfile.m4 b/gnulib-local/m4/backupfile.m4
index febc532..5e88347 100644
--- a/gnulib-local/m4/backupfile.m4
+++ b/gnulib-local/m4/backupfile.m4
@@ -1,5 +1,5 @@
 # backupfile.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 2001-2003, 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 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/gnulib-local/m4/curses.m4 b/gnulib-local/m4/curses.m4
index 9de43d2..38edc30 100644
--- a/gnulib-local/m4/curses.m4
+++ b/gnulib-local/m4/curses.m4
@@ -1,5 +1,5 @@
 # curses.m4 serial 1 (gettext-0.18)
-dnl Copyright (C) 2008, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 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/gnulib-local/m4/gcj.m4 b/gnulib-local/m4/gcj.m4
index 021bc7c..521ee7d 100644
--- a/gnulib-local/m4/gcj.m4
+++ b/gnulib-local/m4/gcj.m4
@@ -1,5 +1,5 @@
 # gcj.m4 serial 2 (gettext-0.17)
-dnl Copyright (C) 2002, 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2006, 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/gnulib-local/m4/hard-locale.m4.diff b/gnulib-local/m4/hard-locale.m4.diff
deleted file mode 100644
index 1071d48..0000000
--- a/gnulib-local/m4/hard-locale.m4.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-*** gnulib/m4/hard-locale.m4	2005-03-21 23:06:27.000000000 +0100
---- gettext-tools/m4/hard-locale.m4	2005-03-09 00:49:02.000000000 +0100
-***************
-*** 5,11 ****
-  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],
-! [
-!   AC_LIBOBJ([hard-locale])
-! ])
---- 5,8 ----
-  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/gnulib-local/m4/java.m4 b/gnulib-local/m4/java.m4
index 3285dd5..9888af1 100644
--- a/gnulib-local/m4/java.m4
+++ b/gnulib-local/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/gnulib-local/m4/libcroco.m4 b/gnulib-local/m4/libcroco.m4
index 859080c..f79ea82 100644
--- a/gnulib-local/m4/libcroco.m4
+++ b/gnulib-local/m4/libcroco.m4
@@ -1,5 +1,5 @@
 # libcroco.m4 serial 2 (gettext-0.17)
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 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/gnulib-local/m4/libglib.m4 b/gnulib-local/m4/libglib.m4
index f0df4ce..42e55e6 100644
--- a/gnulib-local/m4/libglib.m4
+++ b/gnulib-local/m4/libglib.m4
@@ -1,5 +1,5 @@
 # libglib.m4 serial 3 (gettext-0.17)
-dnl Copyright (C) 2006-2007, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 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/gnulib-local/m4/libxml.m4 b/gnulib-local/m4/libxml.m4
index fa8e8e7..480c700 100644
--- a/gnulib-local/m4/libxml.m4
+++ b/gnulib-local/m4/libxml.m4
@@ -1,5 +1,5 @@
 # libxml.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2006, 2008, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008, 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.
@@ -44,8 +44,12 @@ AC_DEFUN([gl_LIBXML],
       LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
       AC_TRY_LINK([#include <libxml/xmlversion.h>
                    #include <libxml/xmlmemory.h>
+                   #include <libxml/xpath.h>
                   ],
-        [xmlCheckVersion (0); xmlFree ((void *) 0);],
+        [xmlCheckVersion (0);
+         xmlFree ((void *) 0);
+         xmlXPathSetContextNode ((void *)0, (void *)0);
+        ],
         [gl_cv_libxml=yes
          gl_cv_LIBXML="$LIBXML2 $LIBICONV"
          gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -55,8 +59,12 @@ AC_DEFUN([gl_LIBXML],
         CPPFLAGS="$CPPFLAGS $INCXML2"
         AC_TRY_LINK([#include <libxml/xmlversion.h>
                      #include <libxml/xmlmemory.h>
+                     #include <libxml/xpath.h>
                     ],
-          [xmlCheckVersion (0); xmlFree ((void *) 0);],
+          [xmlCheckVersion (0);
+           xmlFree ((void *) 0);
+           xmlXPathSetContextNode ((void *)0, (void *)0);
+          ],
           [gl_cv_libxml=yes
            gl_cv_LIBXML="$LIBXML2 $LIBICONV"
            gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
@@ -82,8 +90,12 @@ AC_DEFUN([gl_LIBXML],
             CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
             AC_TRY_LINK([#include <libxml/xmlversion.h>
                          #include <libxml/xmlmemory.h>
+                         #include <libxml/xpath.h>
                         ],
-              [xmlCheckVersion (0); xmlFree ((void *) 0);],
+              [xmlCheckVersion (0);
+               xmlFree ((void *) 0);
+               xmlXPathSetContextNode ((void *)0, (void *)0);
+              ],
               [gl_cv_libxml=yes
                gl_cv_LIBXML="$LIBXML2 $LIBICONV"
                gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
diff --git a/gnulib-local/m4/moo.m4 b/gnulib-local/m4/moo.m4
index 3bda672..88e66a9 100644
--- a/gnulib-local/m4/moo.m4
+++ b/gnulib-local/m4/moo.m4
@@ -1,5 +1,5 @@
 # moo.m4 serial 1 (gettext-0.17)
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 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/gnulib-local/m4/term-ostream.m4 b/gnulib-local/m4/term-ostream.m4
index c227384..bcc931e 100644
--- a/gnulib-local/m4/term-ostream.m4
+++ b/gnulib-local/m4/term-ostream.m4
@@ -1,5 +1,5 @@
 # term-ostream.m4 serial 1
-dnl Copyright (C) 2006, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 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/gnulib-local/m4/termcap.m4 b/gnulib-local/m4/termcap.m4
index 1ab0673..93511d9 100644
--- a/gnulib-local/m4/termcap.m4
+++ b/gnulib-local/m4/termcap.m4
@@ -1,5 +1,5 @@
 # termcap.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006, 2008, 2015 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2006, 2008, 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/gnulib-local/m4/terminfo.m4 b/gnulib-local/m4/terminfo.m4
index 070e86e..8257e25 100644
--- a/gnulib-local/m4/terminfo.m4
+++ b/gnulib-local/m4/terminfo.m4
@@ -1,5 +1,5 @@
 # terminfo.m4 serial 3 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006, 2008, 2015 Free Software Foundation,
+dnl Copyright (C) 2000-2002, 2006, 2008, 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/gnulib-local/m4/unionwait.m4 b/gnulib-local/m4/unionwait.m4
index 4ec7bf3..95199f3 100644
--- a/gnulib-local/m4/unionwait.m4
+++ b/gnulib-local/m4/unionwait.m4
@@ -1,5 +1,5 @@
 # unionwait.m4 serial 1 (gettext-0.11)
-dnl Copyright (C) 1993-2002, 2015 Free Software Foundation, Inc.
+dnl Copyright (C) 1993-2002, 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.