From MAILER-DAEMON Tue Jan 03 13:17:42 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Ri8ve-0006fZ-73
	for mharc-libidn-commit@gnu.org; Tue, 03 Jan 2012 13:17:42 -0500
Received: from eggs.gnu.org ([140.186.70.92]:57380)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Ri8vb-0006et-KY
	for libidn-commit@gnu.org; Tue, 03 Jan 2012 13:17:40 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Ri8va-0000z6-5X
	for libidn-commit@gnu.org; Tue, 03 Jan 2012 13:17:39 -0500
Received: from mailservice.tudelft.nl ([130.161.131.5]:34714)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>)
	id 1Ri8va-0000yn-0n; Tue, 03 Jan 2012 13:17:38 -0500
Received: from localhost (localhost [127.0.0.1])
	by amavis (Postfix) with ESMTP id 6D365CC0E8;
	Tue,  3 Jan 2012 19:17:36 +0100 (CET)
X-Quarantine-ID: <cfzdqwquVo7g>
X-Virus-Scanned: amavisd-new at tudelft.nl
X-Amavis-Alert: BAD HEADER SECTION, Non-encoded 8-bit data (char C3 hex): To:
	...ommit@gnu.org, Ludovic Court\303\250s <ludo@gnu.org>
Received: from mailservice.tudelft.nl ([130.161.131.71])
	by localhost (tudelft.nl [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id cfzdqwquVo7g; Tue,  3 Jan 2012 19:17:35 +0100 (CET)
Received: from lucifer (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by mx4.tudelft.nl (Postfix) with SMTP id B3ADACC0EE;
	Tue,  3 Jan 2012 19:17:34 +0100 (CET)
Received: by lucifer (sSMTP sendmail emulation);
	Tue, 03 Jan 2012 19:17:34 +0100
To: libidn-commit@gnu.org, Ludovic CourtÃ¨s <ludo@gnu.org>
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Subject: Hydra job gnu:libidn-master:build build 1717012: Success
X-Hydra-Instance: lucifer
X-Hydra-Project: gnu
X-Hydra-Jobset: libidn-master
X-Hydra-Job: build
Date: Tue, 3 Jan 2012 19:17:34 +0100
Message-Id: <20120103181734.B3ADACC0EE@mx4.tudelft.nl>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 130.161.131.5
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2012 18:17:40 -0000

Hi,

This is to let you know that Hydra build 1717012 of job gnu:libidn-master:build has changed from 'Failed' to 'Success'.

Complete build information can be found on this page: http://hydra.nixos.org/build/1717012

A summary of the build information follows:

Build ID:              | 1717012
Nix name:              | libidn-1.23.5
Short description:     | Native Nix build on x86_64-darwin
Maintainer(s):         | libidn-commit@gnu.org, Ludovic CourtÃ¨s <ludo@gnu.org>
System:                | x86_64-darwin
Derivation store path: | /nix/store/2kj2gn54nr6y8ga7vpn31kmcvd2pxz0h-libidn-1.23.5.drv
Output store path:     | /nix/store/v7krshmm5p25h53bwj22gr09452nmxpx-libidn-1.23.5
Time added:            | 2012-01-03 19:17:34
Build started:         | 2012-01-03 19:15:54
Build finished:        | 2012-01-03 19:17:34
Duration:              | 100s

The build inputs were:

Name        | Type   | Value
------------+--------+--------------------------------------------------------------------------------------
hydraConfig | git    | git://git.savannah.gnu.org/hydra-recipes.git:e81f7027a33221153e0606e88191ed035febbee3
nixpkgs     | svn    | https://nixos.org/repos/nix/nixpkgs/trunk:31248
system      | string | x86_64-darwin
tarball     | build  | 1710566
libidnSrc   | git    | git://git.sv.gnu.org/libidn.git:7eb160b532462dc483686aa376b798157aab2c43

Regards,

The Hydra build daemon.


From MAILER-DAEMON Tue Jan 03 17:19:25 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RiChZ-0004rI-TA
	for mharc-libidn-commit@gnu.org; Tue, 03 Jan 2012 17:19:25 -0500
Received: from eggs.gnu.org ([140.186.70.92]:54418)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RiCh6-0004lD-38
	for libidn-commit@gnu.org; Tue, 03 Jan 2012 17:19:24 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RiCgY-0006DO-Hq
	for libidn-commit@gnu.org; Tue, 03 Jan 2012 17:18:56 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44016)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RiCgX-0006D1-Tk
	for libidn-commit@gnu.org; Tue, 03 Jan 2012 17:18:22 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RiCgW-0000Zr-SQ
	for libidn-commit@gnu.org; Tue, 03 Jan 2012 22:18:21 +0000
Date: Tue, 03 Jan 2012 22:18:20 +0000
Message-Id: <E1RiCgW-0000Zr-SQ@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-23-14-g9183f8a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7eb160b532462dc483686aa376b798157aab2c43
X-Git-Newrev: 9183f8ac255addb4360bc25c3bd4583dbe10d3d7
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2012 22:19:24 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=9183f8ac255addb4360bc25c3bd4583dbe10d3d7

The branch, master has been updated
       via  9183f8ac255addb4360bc25c3bd4583dbe10d3d7 (commit)
       via  54971e7944e541e37dbdfc18326186a9bf7ac409 (commit)
       via  814b825b746edd268426330b400fddeb1aa49f1f (commit)
       via  0560e13c025c6b6e130a667d5050935e4d3ac817 (commit)
       via  74a67f4cbd4cd8b6c17d4bed3344aa11ca766c28 (commit)
       via  9ce1cf11ab498dd53463424c4bd43765c3f28eaa (commit)
       via  20d8990f49cf10976fa224862e31bae0a6ff83a2 (commit)
       via  480811fbc5809f13dc61e690e91a25ea585c9bc9 (commit)
       via  ea7446e4faaa6c9779b7cea4f2309c44adb42ba2 (commit)
      from  7eb160b532462dc483686aa376b798157aab2c43 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9183f8ac255addb4360bc25c3bd4583dbe10d3d7
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jan 3 23:17:24 2012 +0100

    Update gnulib files.

commit 54971e7944e541e37dbdfc18326186a9bf7ac409
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 2 22:34:12 2012 +0100

    Remove stale translation.

commit 814b825b746edd268426330b400fddeb1aa49f1f
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 2 22:31:00 2012 +0100

    Update FSF copyright years.

commit 0560e13c025c6b6e130a667d5050935e4d3ac817
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 2 22:17:17 2012 +0100

    Update copyright years.

commit 74a67f4cbd4cd8b6c17d4bed3344aa11ca766c28
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Dec 27 13:22:40 2011 +0100

    Mention gnulib in THANKS.

commit 9ce1cf11ab498dd53463424c4bd43765c3f28eaa
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Dec 27 13:18:43 2011 +0100

    Update key.

commit 20d8990f49cf10976fa224862e31bae0a6ff83a2
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Dec 27 13:09:39 2011 +0100

    Sync glib NFKC code and improve copyright/license statements.

commit 480811fbc5809f13dc61e690e91a25ea585c9bc9
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Dec 27 11:44:25 2011 +0100

    Sync with TP.

commit ea7446e4faaa6c9779b7cea4f2309c44adb42ba2
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Dec 27 10:25:20 2011 +0100

    Update gnulib files.

-----------------------------------------------------------------------

Summary of changes:
 .clcopying                                      |    3 +-
 AUTHORS                                         |  702 ++++++----
 ChangeLog                                       |    3 +-
 FAQ                                             |    3 +-
 GNUmakefile                                     |    2 +-
 Makefile.am                                     |    3 +-
 NEWS                                            |    6 +-
 README                                          |    3 +-
 README-alpha                                    |    2 +-
 THANKS                                          |    9 +-
 TODO                                            |    3 +-
 build-aux/config.rpath                          |    2 +-
 build-aux/csharpcomp.sh.in                      |    2 +-
 build-aux/csharpexec.sh.in                      |    2 +-
 build-aux/pmccabe2html                          |    2 +-
 build-aux/snippet/arg-nonnull.h                 |    2 +-
 build-aux/snippet/c++defs.h                     |    2 +-
 build-aux/snippet/unused-parameter.h            |    2 +-
 build-aux/snippet/warn-on-use.h                 |    2 +-
 build-aux/update-copyright                      |    2 +-
 build-aux/useless-if-before-free                |    2 +-
 build-aux/vc-list-files                         |    2 +-
 cfg.mk                                          |    6 +-
 configure.ac                                    |    2 +-
 contrib/README                                  |    3 +-
 contrib/doxygen/gdoc2doxygen                    |    2 +-
 contrib/java/Makefile.am                        |    3 +-
 contrib/java/README                             |    2 +-
 csharp/IDNA.cs                                  |    3 +-
 csharp/IDNAException.cs                         |    3 +-
 csharp/Makefile.am                              |    2 +-
 csharp/NFKC.cs                                  |    3 +-
 csharp/Punycode.cs                              |    3 +-
 csharp/PunycodeException.cs                     |    3 +-
 csharp/Stringprep.cs                            |    3 +-
 csharp/StringprepException.cs                   |    3 +-
 csharp/generate/AssemblyInfo.cs                 |    3 +-
 csharp/generate/GenerateNFKC.cs                 |    3 +-
 csharp/generate/GenerateRFC3454.cs              |    3 +-
 csharp/generate/HashSet.cs                      |    3 +-
 csharp/generate/Program.cs                      |    3 +-
 csharp/generate/Tokenizer.cs                    |    3 +-
 doc/Makefile.am                                 |    2 +-
 doc/Makefile.gdoci                              |    3 +-
 doc/cyclo/Makefile.am                           |    2 +-
 doc/gdoc                                        |    2 +-
 doc/gendocs_template                            |    2 +-
 doc/java/Makefile.am                            |    3 +-
 doc/libidn.texi                                 |    3 +-
 doc/tld/Makefile.am                             |    3 +-
 doc/tld/README                                  |    3 +-
 doc/tld/fr.tld                                  |    2 +-
 doc/tld/no.tld                                  |    2 +-
 examples/Makefile.am                            |    3 +-
 examples/README                                 |    3 +-
 examples/example.c                              |    3 +-
 examples/example2.c                             |    3 +-
 examples/example3.c                             |    3 +-
 examples/example4.c                             |    3 +-
 examples/example5.c                             |    3 +-
 gl/Makefile.am                                  |    7 +-
 gl/errno.in.h                                   |    2 +-
 gl/error.c                                      |    2 +-
 gl/error.h                                      |    2 +-
 gl/getopt.c                                     |    2 +-
 gl/getopt.in.h                                  |    2 +-
 gl/getopt1.c                                    |    2 +-
 gl/getopt_int.h                                 |    2 +-
 gl/gettext.h                                    |    2 +-
 gl/intprops.h                                   |    2 +-
 gl/m4/00gnulib.m4                               |    2 +-
 gl/m4/alloca.m4                                 |    2 +-
 gl/m4/autobuild.m4                              |    2 +-
 gl/m4/close.m4                                  |    2 +-
 gl/m4/csharp.m4                                 |    2 +-
 gl/m4/csharpcomp.m4                             |    2 +-
 gl/m4/csharpexec.m4                             |    2 +-
 gl/m4/dup2.m4                                   |    2 +-
 gl/m4/eealloc.m4                                |    2 +-
 gl/m4/environ.m4                                |    2 +-
 gl/m4/errno_h.m4                                |    2 +-
 gl/m4/error.m4                                  |    2 +-
 gl/m4/extensions.m4                             |    2 +-
 gl/m4/fcntl-o.m4                                |    2 +-
 gl/m4/fcntl_h.m4                                |    2 +-
 gl/m4/fdopen.m4                                 |    2 +-
 gl/m4/fstat.m4                                  |    2 +-
 gl/m4/getcwd.m4                                 |    2 +-
 gl/m4/getopt.m4                                 |    2 +-
 gl/m4/gnulib-cache.m4                           |    2 +-
 gl/m4/gnulib-common.m4                          |    2 +-
 gl/m4/gnulib-comp.m4                            |    5 +-
 gl/m4/gnulib-tool.m4                            |    2 +-
 gl/m4/include_next.m4                           |    2 +-
 gl/m4/inttypes-pri.m4                           |    2 +-
 gl/m4/inttypes.m4                               |   20 +-
 gl/m4/largefile.m4                              |    2 +-
 gl/m4/longlong.m4                               |    2 +-
 gl/m4/lstat.m4                                  |    2 +-
 gl/m4/malloc.m4                                 |    2 +-
 gl/m4/malloca.m4                                |    2 +-
 gl/m4/manywarnings.m4                           |    2 +-
 gl/m4/mode_t.m4                                 |    2 +-
 gl/m4/msvc-inval.m4                             |    2 +-
 gl/m4/msvc-nothrow.m4                           |    2 +-
 gl/m4/multiarch.m4                              |    2 +-
 gl/m4/nocrash.m4                                |    2 +-
 gl/m4/open.m4                                   |    2 +-
 gl/m4/pathmax.m4                                |    2 +-
 gl/m4/putenv.m4                                 |    2 +-
 gl/m4/setenv.m4                                 |    2 +-
 gl/m4/ssize_t.m4                                |    2 +-
 gl/m4/stat.m4                                   |    2 +-
 gl/m4/stdarg.m4                                 |    2 +-
 gl/m4/stdbool.m4                                |    2 +-
 gl/m4/stddef_h.m4                               |    2 +-
 gl/m4/stdint.m4                                 |    8 +-
 gl/m4/stdio_h.m4                                |    2 +-
 gl/m4/stdlib_h.m4                               |    2 +-
 gl/m4/strerror.m4                               |    2 +-
 gl/m4/string_h.m4                               |    2 +-
 gl/m4/symlink.m4                                |    2 +-
 gl/m4/sys_socket_h.m4                           |    2 +-
 gl/m4/sys_stat_h.m4                             |    2 +-
 gl/m4/time_h.m4                                 |    2 +-
 gl/m4/unistd_h.m4                               |   18 +-
 gl/m4/valgrind-tests.m4                         |    2 +-
 gl/m4/version-etc.m4                            |    2 +-
 gl/m4/warn-on-use.m4                            |    2 +-
 gl/m4/warnings.m4                               |    2 +-
 gl/m4/wchar_h.m4                                |    2 +-
 gl/m4/wchar_t.m4                                |    2 +-
 gl/m4/wint_t.m4                                 |    2 +-
 gl/msvc-inval.c                                 |    2 +-
 gl/msvc-inval.h                                 |    2 +-
 gl/msvc-nothrow.c                               |    2 +-
 gl/msvc-nothrow.h                               |    2 +-
 gl/progname.c                                   |    2 +-
 gl/progname.h                                   |    2 +-
 gl/stdarg.in.h                                  |    2 +-
 gl/stddef.in.h                                  |    2 +-
 gl/strerror-override.c                          |    2 +-
 gl/strerror-override.h                          |    2 +-
 gl/strerror.c                                   |    2 +-
 gl/string.in.h                                  |    2 +-
 gl/unistd.in.h                                  |   50 +-
 gl/verify.h                                     |    2 +-
 gl/version-etc.c                                |    4 +-
 gl/version-etc.h                                |    2 +-
 gltests/Makefile.am                             |   14 +-
 gltests/alloca.in.h                             |    2 +-
 gltests/binary-io.h                             |    2 +-
 gltests/close.c                                 |    2 +-
 gltests/dosname.h                               |    2 +-
 gltests/dup2.c                                  |    2 +-
 gltests/fcntl.in.h                              |    2 +-
 gltests/fd-hook.c                               |    2 +-
 gltests/fd-hook.h                               |    2 +-
 gltests/fdopen.c                                |    2 +-
 gltests/fstat.c                                 |    2 +-
 gltests/getcwd-lgpl.c                           |    2 +-
 gltests/ignore-value.h                          |    2 +-
 gltests/init.sh                                 |   24 +-
 gltests/inttypes.in.h                           | 1744 ++++++++++++-----------
 gltests/lstat.c                                 |    2 +-
 gltests/macros.h                                |    2 +-
 gltests/malloc.c                                |    2 +-
 gltests/malloca.c                               |    2 +-
 gltests/malloca.h                               |    2 +-
 gltests/open.c                                  |    2 +-
 gltests/pathmax.h                               |    2 +-
 gltests/putenv.c                                |    2 +-
 gltests/same-inode.h                            |   16 +-
 gltests/setenv.c                                |    2 +-
 gltests/signature.h                             |    2 +-
 gltests/stat.c                                  |    2 +-
 gltests/stdbool.in.h                            |    2 +-
 gltests/stdint.in.h                             |   21 +-
 gltests/stdio.in.h                              |    2 +-
 gltests/stdlib.in.h                             |    2 +-
 gltests/symlink.c                               |    2 +-
 gltests/sys_stat.in.h                           |    2 +-
 gltests/test-alloca-opt.c                       |    2 +-
 gltests/test-binary-io.c                        |    2 +-
 gltests/test-close.c                            |    2 +-
 gltests/test-dup2.c                             |    2 +-
 gltests/test-environ.c                          |    2 +-
 gltests/test-errno.c                            |    2 +-
 gltests/test-fdopen.c                           |    2 +-
 gltests/test-fgetc.c                            |    2 +-
 gltests/test-fputc.c                            |    2 +-
 gltests/test-fread.c                            |    2 +-
 gltests/test-fstat.c                            |    2 +-
 gltests/test-fwrite.c                           |    2 +-
 gltests/test-getcwd-lgpl.c                      |    2 +-
 gltests/test-getopt.c                           |    2 +-
 gltests/test-getopt.h                           |    2 +-
 gltests/test-getopt_long.h                      |    2 +-
 gltests/test-ignore-value.c                     |    2 +-
 gltests/test-init.sh                            |   68 +
 gltests/test-intprops.c                         |    2 +-
 gltests/test-inttypes.c                         |    5 +-
 gltests/test-lstat.c                            |    2 +-
 gltests/test-lstat.h                            |    2 +-
 gltests/test-malloca.c                          |    2 +-
 gltests/test-open.c                             |    2 +-
 gltests/test-open.h                             |    2 +-
 gltests/test-pathmax.c                          |    2 +-
 gltests/test-setenv.c                           |    2 +-
 gltests/test-stat.c                             |    2 +-
 gltests/test-stat.h                             |    2 +-
 gltests/test-stdbool.c                          |    2 +-
 gltests/test-stddef.c                           |    2 +-
 gltests/test-stdint.c                           |    4 +-
 gltests/test-stdio.c                            |    2 +-
 gltests/test-strerror.c                         |    2 +-
 gltests/test-symlink.c                          |    2 +-
 gltests/test-symlink.h                          |    2 +-
 gltests/test-unsetenv.c                         |    2 +-
 gltests/test-vc-list-files-cvs.sh               |    2 +-
 gltests/test-vc-list-files-git.sh               |    2 +-
 gltests/test-verify.c                           |    2 +-
 gltests/test-version-etc.c                      |    2 +-
 gltests/test-version-etc.sh                     |    2 +-
 gltests/time.in.h                               |    2 +-
 gltests/unsetenv.c                              |    2 +-
 gltests/version-etc-fsf.c                       |    2 +-
 gltests/wchar.in.h                              |    2 +-
 java/Makefile.am                                |    3 +-
 java/gnu/inet/encoding/IDNA.java                |    3 +-
 java/gnu/inet/encoding/IDNAException.java       |    3 +-
 java/gnu/inet/encoding/Makefile.am              |    3 +-
 java/gnu/inet/encoding/NFKC.java                |    2 +-
 java/gnu/inet/encoding/Punycode.java            |    3 +-
 java/gnu/inet/encoding/PunycodeException.java   |    3 +-
 java/gnu/inet/encoding/Stringprep.java          |    3 +-
 java/gnu/inet/encoding/StringprepException.java |    3 +-
 java/misc/GenerateNFKC.java                     |    2 +-
 java/misc/GenerateRFC3454.java                  |    3 +-
 java/misc/TestIDNA.java                         |    3 +-
 java/misc/TestNFKC.java                         |    3 +-
 lib/Makefile.am                                 |    5 +-
 lib/gen-stringprep-tables.pl                    |    3 +-
 lib/gen-tld-tables.pl                           |    5 +-
 lib/gen-unicode-tables.pl                       |    3 +-
 lib/gl/Makefile.am                              |    2 +-
 lib/gl/c-ctype.c                                |    2 +-
 lib/gl/c-ctype.h                                |    2 +-
 lib/gl/c-strcase.h                              |    2 +-
 lib/gl/c-strcasecmp.c                           |    2 +-
 lib/gl/c-strncasecmp.c                          |    2 +-
 lib/gl/gettext.h                                |    2 +-
 lib/gl/iconv.c                                  |    2 +-
 lib/gl/iconv.in.h                               |    2 +-
 lib/gl/iconv_close.c                            |    2 +-
 lib/gl/iconv_open.c                             |    2 +-
 lib/gl/m4/00gnulib.m4                           |    2 +-
 lib/gl/m4/alloca.m4                             |    2 +-
 lib/gl/m4/codeset.m4                            |    2 +-
 lib/gl/m4/eealloc.m4                            |    2 +-
 lib/gl/m4/environ.m4                            |    2 +-
 lib/gl/m4/extensions.m4                         |    2 +-
 lib/gl/m4/gnulib-cache.m4                       |    2 +-
 lib/gl/m4/gnulib-common.m4                      |    2 +-
 lib/gl/m4/gnulib-comp.m4                        |    5 +-
 lib/gl/m4/gnulib-tool.m4                        |    2 +-
 lib/gl/m4/iconv.m4                              |    2 +-
 lib/gl/m4/iconv_h.m4                            |    2 +-
 lib/gl/m4/iconv_open.m4                         |    2 +-
 lib/gl/m4/include_next.m4                       |    2 +-
 lib/gl/m4/inline.m4                             |    2 +-
 lib/gl/m4/intlmacosx.m4                         |    2 +-
 lib/gl/m4/inttypes-pri.m4                       |    2 +-
 lib/gl/m4/inttypes.m4                           |   20 +-
 lib/gl/m4/lcmessage.m4                          |    2 +-
 lib/gl/m4/ld-output-def.m4                      |    2 +-
 lib/gl/m4/ld-version-script.m4                  |    2 +-
 lib/gl/m4/lib-ld.m4                             |    2 +-
 lib/gl/m4/lib-link.m4                           |    2 +-
 lib/gl/m4/lib-prefix.m4                         |    2 +-
 lib/gl/m4/libunistring-base.m4                  |    2 +-
 lib/gl/m4/locale-fr.m4                          |    2 +-
 lib/gl/m4/locale-ja.m4                          |    2 +-
 lib/gl/m4/locale-tr.m4                          |    2 +-
 lib/gl/m4/locale-zh.m4                          |    2 +-
 lib/gl/m4/locale_h.m4                           |    2 +-
 lib/gl/m4/localename.m4                         |    2 +-
 lib/gl/m4/lock.m4                               |    2 +-
 lib/gl/m4/longlong.m4                           |    2 +-
 lib/gl/m4/malloc.m4                             |    2 +-
 lib/gl/m4/malloca.m4                            |    2 +-
 lib/gl/m4/multiarch.m4                          |    2 +-
 lib/gl/m4/putenv.m4                             |    2 +-
 lib/gl/m4/setenv.m4                             |    2 +-
 lib/gl/m4/setlocale.m4                          |    2 +-
 lib/gl/m4/ssize_t.m4                            |    2 +-
 lib/gl/m4/stdbool.m4                            |    2 +-
 lib/gl/m4/stddef_h.m4                           |    2 +-
 lib/gl/m4/stdint.m4                             |    8 +-
 lib/gl/m4/stdlib_h.m4                           |    2 +-
 lib/gl/m4/string_h.m4                           |    2 +-
 lib/gl/m4/strverscmp.m4                         |    2 +-
 lib/gl/m4/thread.m4                             |    2 +-
 lib/gl/m4/threadlib.m4                          |    2 +-
 lib/gl/m4/unistd_h.m4                           |   18 +-
 lib/gl/m4/visibility.m4                         |    2 +-
 lib/gl/m4/warn-on-use.m4                        |    2 +-
 lib/gl/m4/wchar_h.m4                            |    2 +-
 lib/gl/m4/wchar_t.m4                            |    2 +-
 lib/gl/m4/wint_t.m4                             |    2 +-
 lib/gl/m4/yield.m4                              |    2 +-
 lib/gl/stdbool.in.h                             |    2 +-
 lib/gl/stddef.in.h                              |    2 +-
 lib/gl/stdint.in.h                              |   21 +-
 lib/gl/striconv.c                               |    2 +-
 lib/gl/striconv.h                               |    2 +-
 lib/gl/string.in.h                              |    2 +-
 lib/gl/strverscmp.c                             |    2 +-
 lib/gl/unistr.in.h                              |    2 +-
 lib/gl/unistr/u8-mbtoucr.c                      |    2 +-
 lib/gl/unistr/u8-uctomb-aux.c                   |    2 +-
 lib/gl/unistr/u8-uctomb.c                       |    2 +-
 lib/gl/unitypes.in.h                            |    2 +-
 lib/gltests/Makefile.am                         |   17 +-
 lib/gltests/alloca.in.h                         |    2 +-
 lib/gltests/glthread/lock.c                     |    2 +-
 lib/gltests/glthread/lock.h                     |    2 +-
 lib/gltests/glthread/thread.c                   |    2 +-
 lib/gltests/glthread/thread.h                   |    2 +-
 lib/gltests/glthread/threadlib.c                |    2 +-
 lib/gltests/glthread/yield.h                    |    2 +-
 lib/gltests/init.sh                             |   24 +-
 lib/gltests/intprops.h                          |    2 +-
 lib/gltests/inttypes.in.h                       | 1744 ++++++++++++-----------
 lib/gltests/locale.in.h                         |    2 +-
 lib/gltests/localename.c                        |    2 +-
 lib/gltests/localename.h                        |    2 +-
 lib/gltests/macros.h                            |    2 +-
 lib/gltests/malloc.c                            |    2 +-
 lib/gltests/malloca.c                           |    2 +-
 lib/gltests/malloca.h                           |    2 +-
 lib/gltests/putenv.c                            |    2 +-
 lib/gltests/setenv.c                            |    2 +-
 lib/gltests/setlocale.c                         |    2 +-
 lib/gltests/signature.h                         |    2 +-
 lib/gltests/stdlib.in.h                         |    2 +-
 lib/gltests/test-alloca-opt.c                   |    2 +-
 lib/gltests/test-c-ctype.c                      |    2 +-
 lib/gltests/test-c-strcasecmp.c                 |    2 +-
 lib/gltests/test-c-strncasecmp.c                |    2 +-
 lib/gltests/test-environ.c                      |    2 +-
 lib/gltests/test-iconv.c                        |    2 +-
 lib/gltests/test-init.sh                        |   68 +
 lib/gltests/test-intprops.c                     |    2 +-
 lib/gltests/test-inttypes.c                     |    5 +-
 lib/gltests/test-locale.c                       |    2 +-
 lib/gltests/test-localename.c                   |    2 +-
 lib/gltests/test-lock.c                         |    2 +-
 lib/gltests/test-malloca.c                      |    2 +-
 lib/gltests/test-setenv.c                       |    2 +-
 lib/gltests/test-setlocale1.c                   |    2 +-
 lib/gltests/test-setlocale2.c                   |    2 +-
 lib/gltests/test-stdbool.c                      |    2 +-
 lib/gltests/test-stddef.c                       |    2 +-
 lib/gltests/test-stdint.c                       |    4 +-
 lib/gltests/test-stdlib.c                       |    2 +-
 lib/gltests/test-striconv.c                     |    2 +-
 lib/gltests/test-strverscmp.c                   |    2 +-
 lib/gltests/test-sys_wait.h                     |    2 +-
 lib/gltests/test-thread_create.c                |    2 +-
 lib/gltests/test-thread_self.c                  |    2 +-
 lib/gltests/test-unistd.c                       |    2 +-
 lib/gltests/test-unsetenv.c                     |    2 +-
 lib/gltests/test-verify.c                       |    2 +-
 lib/gltests/unistd.in.h                         |   50 +-
 lib/gltests/unistr/test-u8-mbtoucr.c            |    2 +-
 lib/gltests/unistr/test-u8-uctomb.c             |    2 +-
 lib/gltests/unsetenv.c                          |    2 +-
 lib/gltests/verify.h                            |    2 +-
 lib/gltests/wchar.in.h                          |    2 +-
 lib/idn-free.c                                  |    3 +-
 lib/idn-free.h                                  |    3 +-
 lib/idna.c                                      |    3 +-
 lib/idna.h                                      |    3 +-
 lib/libidn.map                                  |    2 +-
 lib/nfkc.c                                      |  336 +++--
 lib/pr29.c                                      |    3 +-
 lib/pr29.h                                      |    3 +-
 lib/profiles.c                                  |    3 +-
 lib/punycode.c                                  |    3 +-
 lib/punycode.h                                  |    3 +-
 lib/strerror-idna.c                             |    3 +-
 lib/strerror-pr29.c                             |    3 +-
 lib/strerror-punycode.c                         |    3 +-
 lib/strerror-stringprep.c                       |    3 +-
 lib/strerror-tld.c                              |    3 +-
 lib/stringprep.c                                |    3 +-
 lib/stringprep.h                                |    3 +-
 lib/tld.c                                       |    5 +-
 lib/tld.h                                       |    5 +-
 lib/toutf8.c                                    |    3 +-
 lib/version.c                                   |    3 +-
 libc/README                                     |    3 +-
 libc/example.c                                  |    2 +-
 libc/getaddrinfo-idn.txt                        |    2 +-
 libidn.pc.in                                    |    3 +-
 maint.mk                                        |   11 +-
 po/it.po.in                                     |  181 ++--
 po/rw.po.in                                     |  268 ----
 src/Makefile.am                                 |    3 +-
 src/idn.c                                       |    3 +-
 src/idn.ggo                                     |    3 +-
 src/idna.el                                     |    3 +-
 src/punycode.el                                 |    3 +-
 tests/Makefile.am                               |    2 +-
 tests/tst_idna.c                                |    3 +-
 tests/tst_idna2.c                               |    3 +-
 tests/tst_idna3.c                               |    2 +-
 tests/tst_idna4.c                               |    2 +-
 tests/tst_nfkc.c                                |    3 +-
 tests/tst_pr29.c                                |    3 +-
 tests/tst_punycode.c                            |    3 +-
 tests/tst_strerror.c                            |    3 +-
 tests/tst_stringprep.c                          |    3 +-
 tests/tst_symbols.c                             |    2 +-
 tests/tst_tld.c                                 |    3 +-
 tests/tst_toutf8.c                              |    3 +-
 tests/utils.c                                   |    3 +-
 tests/utils.h                                   |    3 +-
 win32/include/ac-stdint.h                       |    2 +-
 win32/include/idn-int.h                         |    2 +-
 win32/include/stdbool.h                         |    2 +-
 win32/libidn4win.mk                             |    2 +-
 433 files changed, 3281 insertions(+), 3120 deletions(-)
 create mode 100755 gltests/test-init.sh
 create mode 100755 lib/gltests/test-init.sh
 delete mode 100644 po/rw.po.in

diff --git a/.clcopying b/.clcopying
index 753766b..6ea102c 100644
--- a/.clcopying
+++ b/.clcopying
@@ -1,7 +1,6 @@
 	-----
 
-	Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-	2010, 2011 Simon Josefsson
+	Copyright (C) 2002-2012 Simon Josefsson
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/AUTHORS b/AUTHORS
index cbf2a50..b2dd876 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,6 +1,5 @@
 Libidn AUTHORS -- Information about the authors.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 Simon Josefsson <simon@josefsson.org>
@@ -27,11 +26,11 @@ T5rhTFDfDcT9SO0eIlfKOraSRnVEHyDDH2PAgJFxyneFELcmLUQ66D+m8z+ziGro
 6bcDSBBDMRkHIX6/kH/vnevjqivIld+j8WTcVX+SArcKyzgQ58uMTrfQdLqzh6D9
 sE/838+ZPZkabmKKWMVWccoaUbWGYOcNwO0ABim0JVNpbW9uIEpvc2Vmc3NvbiA8
 c2ltb25Aam9zZWZzc29uLm9yZz6I+wQTAQIARQIbAwQLBwMCAxUCAwMWAgECHgEC
-F4AiGGRuczpzaW1vbi5qb3NlZnNzb24ub3JnP3R5cGU9Q0VSVAUCSGH5iQUJDRh0
-XgAKCRDtoh6UtWVxb3QMBQCLIUgX2OGZ+AUH2qdYEyI43Ecv7/2wZzTH/IDF5H5t
-RS0wGmpzvp/pR7EzRKz7WhH8fHco7xIPsJjm2qgCWKEe+aVwRWyynYjfz9U6eVnf
-wtLfnE09nWrc9jy+VxSgDEZKPa0k/AtTFjoq4h/GpHOlOjPtVcv3WHDtk39w8a1w
-y0xcq5H1faERDLERWbulvD+1E+e/BKYp/7E2GAOtfSFziEYEExECAAYFAj1Y8sIA
+F4AiGGRuczpzaW1vbi5qb3NlZnNzb24ub3JnP3R5cGU9Q0VSVAUCTvm3NgUJFLfe
+CQAKCRDtoh6UtWVxb7BxBQC3UF6FW9nyukBsGUvz7clNOdAhPyfkvab049xuubjC
++kHGJuS25IzpvvLPIIUik6zZ0cQIWRtzPM2/6rWuktABHFQ0sf0A/o6f7ApEMnna
+MXxNhR2ymWjzc2jSF1zjg/KjwPpzk68Irk6fHbT/vuZASrcXT7ORy+vjhoSoU1uO
+zemp4tO8tK1ehsGKXQN7pPKhWpsMO5zVzZHxAlNUzUsXiEYEExECAAYFAj1Y8sIA
 CgkQV5Mp08AbKiJmNwCgkgjjuS5TcZq4rVBWNYu1VwQlJWYAoJZf+pBNBvzT9xOg
 Hcs1cAMwT4FHiEwEExECAAwFAj1esHUFgwFXijYACgkQvLvElXGKklZXlwCfTWSl
 L2/3q5Od3zBVMKVHgpTo4asAnAtw7vVEIwp9pPuy1oKjTB/obqltiEYEExECAAYF
@@ -235,59 +234,237 @@ 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
-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
+iTpjqq/l1oKwJQYDB0WsqGd+AKDEiDHvrN46b58gzQKdVbs472bFS4j7BBMBAgBF
+AhsDBAsHAwIDFQIDAxYCAQIeAQIXgCIYZG5zOnNpbW9uLmpvc2Vmc3Nvbi5vcmc/
+dHlwZT1DRVJUBQJIYfmJBQkNGHReAAoJEO2iHpS1ZXFvdAwFAIshSBfY4Zn4BQfa
+p1gTIjjcRy/v/bBnNMf8gMXkfm1FLTAaanO+n+lHsTNErPtaEfx8dyjvEg+wmOba
+qAJYoR75pXBFbLKdiN/P1Tp5Wd/C0t+cTT2datz2PL5XFKAMRko9rST8C1MWOiri
+H8akc6U6M+1Vy/dYcO2Tf3DxrXDLTFyrkfV9oREMsRFZu6W8P7UT578Epin/sTYY
+A619IXOI+wQTAQIARQIbAwQLBwMCAxUCAwMWAgECHgECF4AiGGRuczpzaW1vbi5q
+b3NlZnNzb24ub3JnP3R5cGU9Q0VSVAUCSaEuAAUJDq1aTgAKCRDtoh6UtWVxb4pU
+BP9f7+9yeYZCJTvILOWlsYIvl7J2P0em2qYn3NbDUS1yq+BUO8udTYNWwyxX9zGT
+5obhX9bhcWgms/UbGMsvlZcOT+e438P0t1q5q8u+FOgZtfkgZvyacCFvT4Fnd00B
++RaaGZ2atnodvhN8qpzHIf8GVrhzULEtdA55BRw+x5f6ORdSD14IFWirQ4WWKaXT
+URx5LIRxs6twYJawkumU6m4KiNgEEwECACICGwMECwcDAgMVAgMDFgIBAh4BAheA
+BQJAhr4rBQkEnwT+AAoJEO2iHpS1ZXFvkxgE/2ZfCBqYKIe3SDM0tOVNrIeSZuVN
+Uyn2xoqRKK4VomvTI1eMShfGa0twPVlBB5xXHt06yRbwjobJykmDc/Hmteel+FVW
+OcehnXq8T22gLENlEM0CUZellosNwFwdnWGOHGZs/B4BVCh2pzsCra6di7MKCznZ
+DOHX3TBLoqVHjWzCldxtwc6Y7fAsEtrLVos4+0JvjQoYYgHQyril5ywHYs+InAQQ
+AQIABgUCSw6cnwAKCRD1TYragIIf6syABACYfsh56PcvpDJ3pGPoylowLFW4DEP1
+4dFlADmaZd+SedFZqXI/Vv+7fT19W1cx/HqG46WwmSQjPYSqI3IMpB4IYMnsDYDn
+is9GIXLZyy/s4i8WBiiuRkuG69Q+SOjyF4X7MBh3UB2zkelpHHe1OTknOQ+7qzpZ
+rp6YhpAMSmSx8ohGBBARAgAGBQJF6qGjAAoJEC+VFQiq5gIukCUAn2UXazhZrEHL
+vZH0c56N2LdNHYI6AJ4zZnN8vY09pgpA6p7+YGQfnjuyBohGBBARAgAGBQJK/ASb
+AAoJENG84OKPoRoVuxQAnRhqvmMVRkSQiHLSQEnXu4zO2SiXAJ4l9/uWrMqAKUPe
+BcxbT7xrnru0zIhGBBARAgAGBQJK/BdwAAoJEHJZXrGBcEuTMP4AoKtme6FdYL53
+bVxbHklI8QwQEx6jAKCPSXqJmdslSfamkqA0dTncqUAZPohGBBARAgAGBQJLASuc
+AAoJEBgFUbrZWjw1PeIAn3GHmjiGSmkJzDAKpovoGEviB4DQAJ4+tap00n1o0q+b
++8YjEN9tCt/VZohGBBARAgAGBQJLDEARAAoJEHfdleLqUuz0LZMAn3fBmDQzpfUX
+yhciz6dUirKC0L6aAJ9IbQB4y0s1o8eR2ZxRXy5cYB30FIhGBBARAgAGBQJLDbh7
+AAoJEI53TMap06Pgx1gAnArZ857v7THGYpmTCjbwBz1oh7+4AJ9CNLFSBqnrZ+9p
+YKH12RiFHLmuLYhMBBMRAgAMBQI9XrB1BYMBV4o2AAoJELy7xJVxipJWGZ0Anjly
+M5hKGecjlTcoKYWJlMDjf0vCAJ99oFg8mkzKasg3CREHi3Y3Fu26EohGBBARAgAG
+BQJLHGQ7AAoJEMcaTGXwWbHRLcgAn2h+moRVxidIb1mADTBGcOy0DjFjAJ9JLJMZ
+gCvnQEmvyZcIssqTJ8Gx4YhWBBARCwAGBQJLEp4JAAoJEPKthaweQrNnE7UA3jYY
+Ov08+w9dAdbxBmwnL+Lev2ZdSP8M+YS1pXIA31NNq1SYUuqb2CVCGUmMo8m/a5uS
+Z/0c2Yyr5OSI+wQTAQIARQIbAwQLBwMCAxUCAwMWAgECHgECF4AiGGRuczpzaW1v
+bi5qb3NlZnNzb24ub3JnP3R5cGU9Q0VSVAUCSe3n2gUJDvoUKwAKCRDtoh6UtWVx
+b8gaBP0SDiN4gn0EUY2PPLQvFNkvZ96dIpHbMpjfjkmYSJF0zhgcD7bxWXjXDNng
+BblX3JMs3yhg1GfQLvLVpQ64FakTT/XLCo9VecyFxILzq4aSQHyxG6OcAKyq9ibp
+Y4YtUutwV+jiO1/Zos8cdtsyDdn5RYYe6v27omKYRKrGHNlk8NjAQC2pONY8MfPz
+MohWOcGhwdVYatAZXYENCo7hvlruiEYEEBECAAYFAkt731IACgkQchi8veCamme7
+FQCgkuR72TM4Ii1XM3gNK/u1j3B38NwAn3GgZ51dtypPDikroOtv+W3J/bI+iEYE
+EBECAAYFAksBnFgACgkQ2yYwJIHdsGU/+gCff51YjGdTyDHizwOHy35NzqcJMVoA
+n3olfNMrg1kyD1ALOsJrRzgNyBkhiEYEEBECAAYFAkxL87YACgkQgxIgkKLogl4D
+uQCgvZr657F1MuZpnNSIjkwcd2ptvXgAn3eAnUDlROcQMZ0mRLYU9CX2yfdZiEYE
+EBECAAYFAkxN8UgACgkQZR3zUj0j8l2XwgCgtRkGwT5aWUYbHugdou4OuCN5LzIA
+niyPXGVOll6eMmtikWqz2BvJC5dqiEYEEBECAAYFAkxN99oACgkQv2Bwi0hCbH4U
+TQCdGh2w9AKqGWfgM80p2l0bS7kRwIEAn3NoyUgMmxR2RCscRlymHiAO27adiGsE
+EBECACsFAk29TNoFgwHihQAeGmh0dHA6Ly93d3cuY2FjZXJ0Lm9yZy9jcHMucGhw
+AAoJENK7DQFl0P1YOFcAnjf2t4YAmxXRd3d0H7huUtVBqhtsAJ4uiqVhIskY+of4
+xIMhO5JSw4GRKIj7BBMBAgBFAhsDBAsHAwIDFQIDAxYCAQIeAQIXgCIYZG5zOnNp
+bW9uLmpvc2Vmc3Nvbi5vcmc/dHlwZT1DRVJUBQJLg+AvBQkQvjD/AAoJEO2iHpS1
+ZXFvNrAFAJhV4iJili/lBcZSvLUOTgVd5CO7Av33Cu/zOYT7MUW2bWWY4aB83xRL
+lMCIcwGFU8Tyvjow/lZLu82nih/15MMEBcjqi7XmZSszrrB0TULWWP8C6XIpSoap
+nVDo+irjiUjxiVnXK+ML7z5zVGeJbqfzSQdKUWBiYuxEJ6x/1E7hXW/WCgCjz9Fc
+NbSuXNyMIpE03BlAzpILz9n1AY1ynVWJAiIEEwECAAwFAkLYsPEFgwBU+d4ACgkQ
+quPmzmahRGhfdA//cVfLmv3s4VjruQA4BxNcnljFkLHnCMfUwOUFUIPKaYwNxNkR
+Hv5SWwsHlYcH70prr7spkUMO9XCHZqhdXc/UfJm+tjda9Ow3D8Ym4bR4uKaBDcSB
+6rxG7Tkde2OkJeA1uD4ytbrfctsufByul04qgrW4ON4xHG15Na/aiyZdi4KKWCUN
+SiQsH5/gwlWnUQNhYFXJTBlBiHYok8KddvhP+9KGKDMy8JvuzFIGyVKUS8rbHOX6
+4U/dYl9pT6HspQBwENOvNVomsL3sZarQD7aPRo27Z8N9qEjqiCXG2zITfBvO6ZLw
+YZOcF31TO5MrrQRYSB3EBRnrhpGaYHl7eNDXFCX35/ijn3l84HUMJsDZaPStGq8T
+aSLpILoL1XjbbCo9YLVuyJGHC5r5Q8koc/3MrYLjRFPtVtGXhu9046YbPJgkpQil
+XDVnMtpe8/w7wd1T4m2nOduf0sNWSKuw0oURx7/MdNv+ufCxFu4Er72eI98rmUjY
+C9pYD82mKEKPvMrByvXalYlQVwByMFWU5l6bW+c8UHB7RVJ0edSA0gHwRne4I1OT
+STXyip4C4wycuep5iRjMP/tdxeVxXIxjwvbemSqELne9divE0SHM1oBjJ4JGock5
+eCiMD8Vc1p1DdCJHLDv+cjtybnVs82Aeq9UKJgkgAAProq7LScFbQVrAgOeI+wQT
+AQIARQIbAwQLBwMCAxUCAwMWAgECHgECF4AiGGRuczpzaW1vbi5qb3NlZnNzb24u
+b3JnP3R5cGU9Q0VSVAUCQkBc0AUJBlijpAAKCRDtoh6UtWVxb9EIBP4pk/ztQF+X
+V5L4krXEmbjAsGb9C+I+4OoRUY/mWDvNAjGppkhFD+8Q3oQvg+1dcPsJ5rQHSXgA
+2w1bOsTknK9DamyY35LHd9T0ZSllXOUX9q3QeKiDBYc2KB35ZtxKNIA4Lt5qDgYb
+SgtlERxDY94BCSy4YApdwATei3O32t5IoR+BroeIr+w+zn9mVulkn3pRXByYDX/s
+cxcTtWwRL+UNiEwEExECAAwFAkLYsNEFgwBU+f4ACgkQa3Ds2V3D9HPaIQCgkWvO
+hiORHkA1lht5f+jNB5xAKYAAnA0Kg/JKZrGvA7oGJR3XVs7zRs/FiEwEExECAAwF
+AkLYsLEFgwBU+h4ACgkQgcL36+ITtpLuwACdFi5eiQDLrrGLThgPU4O2yxgXDucA
+niWqyEVWfs1HnLOe7S2KhgsXDJzniEwEExECAAwFAkLYsI0FgwBU+kIACgkQGFnQ
+H2d7oezt8QCfXjmAsN4+tvGt/A3Z0bn4i6+m+1gAnihGZHKHHCnBqEYT7nbzXPZV
+OtD1iEwEExECAAwFAkJJRAoFgwATzkoACgkQZr5x/2dIaIPZGACdECs/Brf5HO0P
+WPwIYf8GTur2kPUAoIHIKUWKCeoNUF2FnUzvx8b3uC7viEwEEBECAAwFAkJNgrUF
+gwDgKBoACgkQO46kH4L2EkA4fACeN2w05Staf2i18Sdv9aRax1hb53AAoL1ZYuFf
+T+qVYT/afh9wD7UPlEVUiEYEExECAAYFAkJJAYsACgkQj8NyXz1o1joWfwCgtb8m
+tlI8rg52vT5DRU+Ct3NuDfEAoL7IX823ezbe7HVegheirf3q7zmKiQIcBBMBCAAG
+BQJOXJv+AAoJEH/Z/MsAC+7uMLUP/ihuyOK3rCtKqNdP3FrR5lJJ1WMTLx+r1iMT
+X5we1RfOADPtl7rwlHdOGEI1jvae2iEFVyIiBy6eKn5L9A2HhBJ7wqZsXlqmrJgR
+49RzhHx00UksFmS9uat1YfX+bOH5nuytaeZDCYwBA6/sSmtbeyfSiO6YASFnIO5F
+gM5ZCLrCFQUAb9mFAMUTI+IpYLoPanzHcQ2LvJsfqMc2U6OlyzZJl+UOPbA0jv3h
+hEBJBZB//HYsNjHzLk2BIq/3Ff+VZXMXdmUdqL7eIoIEZz6ep4L0KpUGdK5Zrubg
+D8yLf+qtxX6B+igQ8UGONki3bBggtO7CknJg+qQB24kuSRrA8wTkY4Trxvi6hywx
+eFCuR+205Aakjhbz0Y7dTdZp7zJIPlFz9dfwPfEgTlZx5g6cmG0SJ9JHYG648wFQ
+omcv09cA4P/na7W8DzB+wL7lRjLE4OuTWN1FMN2ZzWudJf4ruPdRRtSZV4kCElSj
+Ht+6NpvqgWeDH0Rnm5sjFxGSwpWqPOkYEGae7KVkB5xoVUe7htBdTiIL9eNabthj
+R/pSaeQD70nTIkoSQwxEnQIPq3gDDxyy+hvCUM2e2u2V150NErLW6BkORtpL71Ja
+yHhPhCgPcYHcYrhg0HcTqNDQJUPXpJ7ATmrfFqxjSreIuJ47YSISawW4xG3qeKRy
+MW28oNSeiEYEEBECAAYFAk5XxfMACgkQB5GvjMAzY/TEAACfXfWm6e7MyFL6snIl
+EmOWw/RRr/EAn0e2W0SRyLRrjMWJk6RIVAOxW1o1iQIcBBABAgAGBQJOYMgJAAoJ
+EFKbqWJpCnCxDv0QANhAtHg6TFyqERlQwz9zz4eragH7e3VlU4hLRURjjJP5zy6R
+IuJYBzm97rpegOtt51eLkMDOjYrnwEkY58elSfOyPLQmcQX06KCF6QH2iwJyCxsB
+5oCQB9IBrmK/4rs9Co2HUwxI1rw6+rfaUAsr4aT6SBylbDcMP/XwBt3MA/kjaI53
+ivrTsMFjH36ffRT3LfeVafdYwux1vtYPDCDQAq7KuWCo7Dkt8bTdoyegnnqfXhvM
+Wokxto1e+fkl4fLmjypWt1/W0fR/jXq2/oiNk6zS6EkVxyjq5m3q06v7AR6GIRaY
+N4ZQOEmHlLkXlQkHiyhvlv2JbjElr5D/jb4TqUid/GrzUosDJrv+RBd7gkccGokd
+zIPw8D53zT38O+geT+ek6iNSVByfqCkG2emuVGjWsUfj79vrsWeyYIxksyYptx0u
+OHWa1ORYyRhZ80uogo0h0MvvY90j4uzJQKfdAAfF01a4MgmBDBN2YqprRqB3kInL
+P9GxM9zgf2lv3jYBfNBjoLZxKlaFH5ISTNHbW0ud8SfTEQTKkX6vS0zkvHCv4Uea
+GQ0qIgDHps88n0Jqk+9apb4Ms1aKkL0E5AJY63Z18IsehdbekgFMvg2FZiA+6J+I
+UvCCnG+mWQbDbcs0aaIiiN58f3gpmSDq15iPyrEwSzOSBKbWmskMd6iX+fk6tCFT
+aW1vbiBKb3NlZnNzb24gPGphc0BleHR1bmRvLmNvbT6IRQQQEQIABgUCSWcljwAK
+CRBHOOohZXSZeiUYAJdfCtm1Aij3dVLTBpyIS1lk5iYrAJ4qXN9eQAJwFC28VZgu
+U+VVCPg2z4hGBBARAgAGBQJC8kruAAoJEG74r8KGV0rKw/0Anj3miI06v5jOKbRJ
+t6wwLINA7N6RAJ9pdfC+4JZ+SMq0w9cO3NKGEsJ12ohGBBARAgAGBQJD+NOWAAoJ
+EOFd2FexXDfRuzYAn2jjBwZqp6NfIRZM+cPQFWosanMIAJ9gZGuZXqOGcRHDYo1V
+wUK7Kg8anYhGBBARAgAGBQJD+NOYAAoJEOFd2FexXDfRRVoAnj+kNh2yJiIAI9JE
+Vccgdv8cdElgAJ9jZHFa4KIdIsdGQZ5G4qS0YkHwKohGBBARAgAGBQJEc4b8AAoJ
+EAixI47drUe278gAn15puEaeLjlpaTndlvxT+LAH/951AJ9b0Hlo7Py6F9c1liLs
+MNWNDnyvZ4hGBBARAgAGBQJEc4cAAAoJEAixI47drUe2X7kAn2STeXyx0720Av+k
+aloy7DBcbQ9PAKCeHu+tG0BJiaFJ5PlFL9z7YTf6KohGBBARAgAGBQJFjAuOAAoJ
+ECmqKFIzPnwjjEMAn1PGwa5O+Wkrfj8P+kUbrNDbQ4njAJwNHA9EwqAhV/iunGMk
+eXqyYR4ESohGBBARAgAGBQJF4eL6AAoJEHhn1Tx0eTXdNRYAoNE99BYi7z6tVqND
+nq2+59mx8xSqAJ93ptV7L/TCXEUfcG4poHiZpSgzO4hGBBARAgAGBQJF4fboAAoJ
+EE1EwCDFwFuumAsAoKvDeDQF6vBxmsDQDRAyaX2hZz81AJ0fENkdFcOUkpvetayT
+WsiPUq9mxIhGBBARAgAGBQJF4grUAAoJEMfZMCWd/6rUgIwAnAq+iewnfvQpYXMR
+QPQHFQ1Q4oIWAKCbUj2FEFUlU6cFznPqIMnUzc2Az4hGBBARAgAGBQJF4gz6AAoJ
+EFUVYHaRYekRoGAAoLkeCD2erYxzbJSjia1ifnlNnSbPAJ9S5mNGOnmLTAYxGOVJ
+AgAXAtZtxIhGBBARAgAGBQJF4hFDAAoJEOVE3gebfDKN370An1/jE3l8uC/UzrtY
+4E8FzB1pavjwAJ4sE44wMa8Bidx6SJny2pLFYxicZ4hGBBARAgAGBQJF4i3iAAoJ
+EHZJQAVJruv27z8AoL1S0MZUyWBxb0qLdQBtaDnOEDwDAKDFehqTzLa4GI1XBWnM
+7+5vreKy3ohGBBARAgAGBQJF4ltVAAoJEFuTwC+eSpyd5QkAn0InDM3Ef74GDEeg
+EJi9CyV68RozAJ47ClCsb4r7WGCYJoplsFHvvGdWGohGBBARAgAGBQJF4sLGAAoJ
+EKrPs4YhG27vaK8AoO3ONc4vHoteNr4J1uO/saI/vuMDAKD4FSdsGU0DcMUzZwIx
++HT74UcxRohGBBARAgAGBQJF4sNGAAoJEH5OpU/Qq0B1hCIAn3odxjrFGyc9x8KC
+aeBYXPcM4nN4AKDc7V60rCdebbhtFhEzdw8uw2TH34hGBBARAgAGBQJF4s6iAAoJ
+ENoZYjcCOz9PL7wAn2GeQZncnl0YvUhMebrsLnO6mHCYAJ4+dnk7nGWFch4j4Pz7
+PUkakSavTYhGBBARAgAGBQJF4vk7AAoJEItKxIGsHnFex+0AniZ4F5qmExcEh9I3
+3H/iGtQ5QKGpAJ4+FJNR7fD2hCbEb+bzWLfB5DU+74hGBBARAgAGBQJF4yKoAAoJ
+ENOjcASuTRzUKTYAoJeMX1gnPVKfjKvcCF2XOOFrhlaUAKDfb/kQ6DYI/0iz2qoz
+s2anY4cAE4hGBBARAgAGBQJF4y0qAAoJELOx+BoCeHiAVAEAnAhbHFmonRhodwe6
+FSak7SPDeFxKAJ4w73sJn9Zb36S2jjtnOYgmrfgLKIhGBBARAgAGBQJF40DdAAoJ
+EB9/MmoS7vYqpcIAoKxAoqVD+73ldkTmVoMa8SGgRczZAJ4kyDtzFs+bsxU87qr1
+QnAbJC47vYhGBBARAgAGBQJF40D3AAoJEDiaVjzCcqEmX2wAni+Nw8JZMW2jdHxu
+YV92EyNvMXZ0AKCUTA6JJ39mCUtXEpSgBy2zlApjyohGBBARAgAGBQJF40uXAAoJ
+ECic/8DmPNbWs4IAn0vpU3ALdg8yT0aq4qQJdX1oVi5bAJ9EVqkfOkE6WqPIaA5p
+nodCaTIddIhGBBARAgAGBQJF409IAAoJECGntTuACWnvwD8An2FF/JEayVKOL++9
+YbNLXpBVeRxaAJ44hot3GOOSS2OIZZ9L/nw4ZRiHWohGBBARAgAGBQJF41UFAAoJ
+EJhL04CsX3AMMy8AoNI1odP+fQA6h4CLWjaEK1qndHhlAKDNY25jsLzqCcJn0JqQ
+aNN3gkvNx4hGBBARAgAGBQJF432jAAoJEM8SNHyWi9WHevAAn2TcTFyH84jOpejO
+mDSTrK30xQx1AJ46kGnM5mgIVuqSDrl/1R4PmrYN44hGBBARAgAGBQJF5Br+AAoJ
+EGQ2Q2EJ80AkeQwAniuGytBx5JvGcFJV5NBliOGfxhs0AJ0be5jI/yWjK/bn88x2
+wmNp3mcA44hGBBARAgAGBQJF5MFdAAoJEHCyAyE69Z0W5t8AoLgQz3ZhGe/hzwQ2
+bBTMeV12AyzhAJ0QWg/BHvHseBde5/14a+V8pt0SXYhGBBARAgAGBQJF5YG2AAoJ
+EHkOjJRh/9qrW5QAniwa6vfWlEt1H8oeUOjJCyp7Ad4GAJ44QWVps5BWoeNpJWcS
+3m4cIFYEXYhGBBARAgAGBQJF6qGjAAoJEC+VFQiq5gIukCUAn2UXazhZrEHLvZH0
+c56N2LdNHYI6AJ4zZnN8vY09pgpA6p7+YGQfnjuyBohGBBARAgAGBQJF7eS5AAoJ
+EDBp6SG3moccZusAnRbuB1slbRLAebBjUhTlyvgSdsibAJ0V/NfekMsvwX6e6my5
+KBTFY4WyuohGBBARAgAGBQJF/2xwAAoJEDqQ/8EUCNfxSUEAoIDQQMHKQdtsKlcQ
+KL3du2kBeaj+AJ0WEKNgRh8NgrcnppW2TpOygvQqM4hGBBARAgAGBQJGtdgxAAoJ
+EF3iSZZbA1iisQsAoJ4LWFLNtSwDA4bNi+qIAHIVkEsbAKCW86SWOi3QcT/cZ+ed
+MZdqTTXeRohGBBARAgAGBQJHWbTuAAoJEHIENnC95fHuRb8An2E3kaGysE5hsrKB
+fkIBlco2Sb2IAJ91er1Yq2k8VOpUsBie/dysvgsYh4hGBBARAgAGBQJHWbfMAAoJ
+EOEOegnnL3n6TYwAn2rA+SuEU9y0LUzxr55/wc6ayG+MAJ0TsyBrQBwA5tj9xg27
+dqvkZy+RYohGBBARAgAGBQJHXAvSAAoJEO2/HhEm8iS4E9oAmgImQfzgb6MQ4drV
+6xO1FrGkP2g4AKCs9bCw4TPhsjuoVLLwnOgzE6+EPYhGBBARAgAGBQJHXR/OAAoJ
+EPG6TB7RyLqPJVAAn0ck2xBfVEwOXIAvYfiotTAAzAsFAKCgmHeAr0iUrC6YICas
+URoecVoJgYhGBBARAgAGBQJHXSCAAAoJELecKLDpf4VtzC4AoNG5vj9Xz/ivXays
+7uOd6aqhapRBAKCMpQuXSYePOXDCEkiGG+YDtoe5mYhGBBARAgAGBQJHXYVEAAoJ
+EIUGW1nVLdGn4mkAoJUnzThPYZZ+i51IjmXANTqr7ys1AJ9pDllBNW6SdJ0/H/fK
+3o9Mda/Pq4hGBBARAgAGBQJIRLl4AAoJEFAsTymWnyod1UAAn2eE7xX2Tm0cJTuG
+M86y/DTgYEWOAJwLQTb+RmtjruSpboc4HQ+HHP4T9ohGBBARAgAGBQJK/ASbAAoJ
+ENG84OKPoRoVgpAAn0UxXXsO8AC23hNCfuvgjSaA9kYnAJ4u5O69pG6D9X0ZmxSj
+BVSxv6VD2YhGBBARAgAGBQJK/BdwAAoJEHJZXrGBcEuTggAAoN5Z9FTq5ZsRFYBM
+q4pM1IIi5TbhAKCNUYEW6JV1TeYtU216eCIVuOV8Q4hGBBARAgAGBQJLASucAAoJ
+EBgFUbrZWjw1BBAAoI0+3cP62FnI3Z1TRcf+OHU9VnSZAKCA2suW6DOY2I/dKl6c
+P44NTvUc0YhGBBARAgAGBQJLAZxYAAoJENsmMCSB3bBl61oAnRtDOz1x35Hloibx
+wa5A9TC7tGprAJ9Enw3pbl149CBC4ebPdXkfG3HFwIhGBBARAgAGBQJLDEARAAoJ
+EHfdleLqUuz0thAAnRssFLNOymUkbXRMV2xCTBxX/MpfAKCYjyOzjPSVoS5eNl+V
+lRSOAM1Gv4hGBBARAgAGBQJLHGRGAAoJEMcaTGXwWbHRgkUAnRLnoCpmX6989NXj
+LRnSNS/dzq2UAJ0QHa6xy3Sn2641FpQ4LLsXwLrZwYhGBBARAgAGBQJLe99SAAoJ
+EHIYvL3gmppngOUAoL/gZ4GkR/ECCqkEeJCUzppwhvcuAJ9KMET7MeaihS3CHw97
+4wVY0hEzI4hGBBARAgAGBQJMS/O2AAoJEIMSIJCi6IJev30AoI/sfMGmBnWu+UNU
+gQN22/V8c5NqAJ9eWEaU2hdXCP8MsbBUwIxzUAlXMYhGBBARAgAGBQJMTfFIAAoJ
+EGUd81I9I/JdI28AoMbAB2wCwsanUZwRLvw9Hs7iCyz8AKCeXydwOVIUAX47I/wy
+OwHwjZVi24hGBBARAgAGBQJMTffaAAoJEL9gcItIQmx+ngAAn3pzLNJ2gaHihWR5
+KIFZuM5rjZVkAJ9Wq8/Vq8CthN5QAtXLwqEmiJCeVYhGBBIRAgAGBQJIWW8rAAoJ
+ECTTK/mqlcNJLoYAnjT3gs2YZrIjXS+XrW8VGc1W013uAKCophfcMkBjGBdHkDUN
+WvDce6uGJohGBBMRAgAGBQI9WPK/AAoJEFeTKdPAGyoiF/cAn0dqzIl3Ss2QfeWn
+AOWEkODC0MsoAJ9Tb+zN+kgKH0f+91o6pT6VQEPn0YhGBBMRAgAGBQJA/z93AAoJ
+EJb/mcQlwOwLW7EAoLqAEMsXFUj3ScAXDYcvQaR+5lN7AKDPPs/9tixtWkuHbW9S
+PuaUfDizQYhGBBMRAgAGBQJBAMp9AAoJEJ7XWD/BTrKC96AAn1wDNEETZX6vDoCY
+dUGpV8NUiyWVAKCgKBgAABm+xdRzvY2ytKMCCPLLHohGBBMRAgAGBQJCSQGLAAoJ
+EI/Dcl89aNY6Fn8AoLW/JrZSPK4Odr0+Q0VPgrdzbg3xAKC+yF/Nt3s23ux1XoIX
+oq396u85iohGBBMRAgAGBQJCSQGQAAoJEI/Dcl89aNY667EAoKu5aEpTLn2dplFP
+Pc7+ojRJc+vVAKDcmOrKUKjImZWIh+Y/vJLwOHYi84hGBBMRAgAGBQJF40TIAAoJ
+EIwl7g8NwLfW7wgAnjB0msHMLIjZvK8oSH0kWpPxmiCGAKDKaUqkSvY0y87IizLQ
+YijodqQvDIhGBBMRAgAGBQJHWnMlAAoJEGhrVt1giiSbLcoAnRgf744XS2aZvXzX
+pdkvqJo8QDZ1AJ0aBMP918C88Tf5Nd1sEIg+t39hdohGBBMRAgAGBQJHXuTeAAoJ
+EIXCJ+WlVzjy1CQAn11r9MoJ0GKP4+b3es9SmnZGyWr3AKCnGQnlg2tgJrChzJ9p
+A97GwdkosohMBBARAgAMBQJCTYK1BYMA4CgaAAoJEDuOpB+C9hJABNIAoM+b0ThD
+6p/FUCWdw+nRYV0CEo2qAKC+QaW6C+mZcFBFIx6AfGyRkE8SEIhMBBARAgAMBQJC
+TYK1BYMA4CgaAAoJEDuOpB+C9hJAOHwAnjdsNOUrWn9otfEnb/WkWsdYW+dwAKC9
+WWLhX0/qlWE/2n4fcA+1D5RFVIhMBBARAgAMBQJF4sR8BYMChj7cAAoJEHMcr9NT
+waMvI8YAoMfRnlA0X1QwWBSFe8ZHXyZX4hAwAKCQz64vRmNK7+9cbAzpFCotaw+h
+i4hMBBIRAgAMBQJA4Fc9BYMAk7TsAAoJEMiB3UdK56tHYAgAoKntYOktDGj5H5u9
+hfIqE9YIayhHAJ9PdLPDyKM6C01fd002zQe/eapsj4hMBBIRAgAMBQJCHfAjBYMA
+PyIxAAoJEBgoK2tFOUoBYsoAnjEtckRH/RlpC18blWLwEYDTSgw7AKClQUzPgy9K
+Nf3j7/MsP/Emrl4+SIhMBBMRAgAMBQI9XrB1BYMBV4o2AAoJELy7xJVxipJWGZ0A
+njlyM5hKGecjlTcoKYWJlMDjf0vCAJ99oFg8mkzKasg3CREHi3Y3Fu26EohMBBMR
+AgAMBQJCSUQKBYMAE85KAAoJEGa+cf9nSGiDgwsAn3jgiKCQHBL3u0JnYrJ61zrp
+257PAJ9aWgtpDW2H3FnjuFzpx3oJT1cOR4hMBBMRAgAMBQJCSUQKBYMAE85KAAoJ
+EGa+cf9nSGiD2RgAnRArPwa3+RztD1j8CGH/Bk7q9pD1AKCByClFignqDVBdhZ1M
+78fG97gu74hMBBMRAgAMBQJC2LCNBYMAVPpCAAoJEBhZ0B9ne6HsQUsAn2Ln//Ts
+mEqIL/bcLtt8Vz82lqjCAJ9a5TbLuUOp4+h43F2CJjrUBL7CK4hMBBMRAgAMBQJC
+2LCNBYMAVPpCAAoJEBhZ0B9ne6Hs7fEAn145gLDePrbxrfwN2dG5+IuvpvtYAJ4o
+RmRyhxwpwahGE+5281z2VTrQ9YhMBBMRAgAMBQJC2LCxBYMAVPoeAAoJEIHC9+vi
+E7aSucUAn0cfeij+j8djU6jDPm/trQHL5/KoAJ4ySAysyVQ8U3fZ+OY3XfYKXPfV
+KIhMBBMRAgAMBQJC2LCxBYMAVPoeAAoJEIHC9+viE7aS7sAAnRYuXokAy66xi04Y
+D1ODtssYFw7nAJ4lqshFVn7NR5yznu0tioYLFwyc54hMBBMRAgAMBQJC2LDRBYMA
+VPn+AAoJEGtw7Nldw/RzYR8An1jLVjT/3xOU0Xd9TV1ON39qxJetAKD6GoejRHaD
+XO2KBoQnrGVgp9wVUIhMBBMRAgAMBQJC2LDRBYMAVPn+AAoJEGtw7Nldw/Rz2iEA
+oJFrzoYjkR5ANZYbeX/ozQecQCmAAJwNCoPySmaxrwO6BiUd11bO80bPxYhMBBMR
+AgAMBQJC8cBwBYMAO+pfAAoJECmqKFIzPnwjf58AoIpuzzaOyGF3g2Ky9dV9vqEC
+BNs1AJ4jRU27Zwovy/hznIR9q+o+euIjoIhWBBARCwAGBQJLEp4JAAoJEPKthawe
+QrNnybMA3ixjtagoUDd5XAO9addD51xRSP6tBBnSpzAniPcA31KUOXObtU+ns4gD
+rv81TxB+LJdJZMdYJkvC8aGIawQQEQIAKwUCReF29QWDAoeMYx4aaHR0cDovL3d3
+dy5jYWNlcnQub3JnL2Nwcy5waHAACgkQ0rsNAWXQ/VgiLQCgiPqK/6keqoRc1gY4
+ezjVthcLdboAnjD5FfICPgGIaPM2+7HKj/FrcSJHiHoEExECADoFAkdck2IzGmh0
+dHA6Ly93d3cuaGVucmlrbm9yZHN0cm9tLm5ldC9zaWduLXBvbGljeS0yMDA2LTEw
+AAoJEOdekMA5zDPbiTQAn3DRwnGevBwyDnhC8QwFVHLOjoXtAJ0W6gyPcHIha72N
+zQYU3+Wa1q6dOYicBBABAgAGBQJLDpyfAAoJEPVNitqAgh/qT4AEAIUmlRr9EnWT
+vdNqDHoVQoThJU/wN2V8nICTngZ5C6A0zP6VTUdF24dBlIoI6k13vkXC1/67lXU/
+a9TTpi4IEzRjrb0tF5iRvFBQUlduByzbNJdGgWkkVzmsBQjSD+WeVk6ApDpdw6s5
+5Tg7s/643H6eKHr54AvWIekMB0C9lOnniKIEEAECAAwFAkJG+cEFgwDmsQ4ACgkQ
+v9buWFf3fwmU8gP+IEINaym7K7FUvZWuCkdJcHshCGVBlTOqI9YB1CTY8LNdRHp8
+jrRXBZFZODPAziH/1ZoiSQjsgTg88BUpxLLSgJHZOqhuPMWlLwa6WsytKGTkuFCn
+Z+mkmHKe7LVnjSKr8OrP7y5OhFtdVqb5dgi9SIeK2ass1Xo+9EWZbco+v/OI2AQT
 AQIAIgIbAwQLBwMCAxUCAwMWAgECHgECF4AFAj69R0YFCQLVjhkACgkQ7aIelLVl
 cW8Y2QT+PjSaIJj37ijex+wJ/HBLkyydqWYVZhuTPTVMLst6DQModRBj3Xi7UYlg
 g7lJ6tRxarVuF/eYW6Zv4jx5FePxKLBeAG+H4FRQH+ogIXeBlDx41X7L25wjSxxP
@@ -310,185 +487,232 @@ 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
-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
-YY0j
-=UQzw
+HfnWxymA1hSyMKPmgmPm6aFd+Lv9d3h5oTVs9TBOiOAEEwECACICGwMECwcDAgMV
+AgMDFgIBAh4BAheABQI/pCtRBQkDvHImABIJEO2iHpS1ZXFvB2VHUEcAAQELngT+
+LofWRDrko7dp+TqX7gGm5bK0c4ZYD35bgTH4xzcpxBbBo5/NZfNUwqkrUZZ+8A1I
+/eWbn0ot2L6GEhRtY33xjJP5Nra4CDbU95MWhpH57OncpAbleyotsFqnSZE3tYm8
+movkQqrfidZXUlLh3X0GecACzyUEW+B6ouzNvWsxR3H8WzC398hmMgbigu3gVTVW
+kefFExSuq9Al90+3hrpPG4j7BBMBAgBFAhsDBAsHAwIDFQIDAxYCAQIeAQIXgCIY
+ZG5zOnNpbW9uLmpvc2Vmc3Nvbi5vcmc/dHlwZT1DRVJUBQJCQFzPBQkGWKOkAAoJ
+EO2iHpS1ZXFvLfME+QHcoVJUM3FqCzf/d+JhZvM5O0wtZ5qBxO793rsE7psgAcHV
+Ie5f87QZNtDp7ZmrnugyBhC67H2FrQKr8lqsIvKbaSzjro8yUoQtswVSef/OrhqS
+gEqs08Aifa66sowT1ZWO181m4BCC7aoNRovx8Huy0P+Y1Z2btPA+uu6UvZLh2iKq
+MP+95zloNHNHZWooG5THFQl0RdCJtybyDmLpn+uI+wQTAQIARQIbAwQLBwMCAxUC
+AwMWAgECHgECF4AiGGRuczpzaW1vbi5qb3NlZnNzb24ub3JnP3R5cGU9Q0VSVAUC
+QkBc0AUJBlijpAAKCRDtoh6UtWVxb9EIBP4pk/ztQF+XV5L4krXEmbjAsGb9C+I+
+4OoRUY/mWDvNAjGppkhFD+8Q3oQvg+1dcPsJ5rQHSXgA2w1bOsTknK9DamyY35LH
+d9T0ZSllXOUX9q3QeKiDBYc2KB35ZtxKNIA4Lt5qDgYbSgtlERxDY94BCSy4YApd
+wATei3O32t5IoR+BroeIr+w+zn9mVulkn3pRXByYDX/scxcTtWwRL+UNiPsEEwEC
+AEUCGwMECwcDAgMVAgMDFgIBAh4BAheAIhhkbnM6c2ltb24uam9zZWZzc29uLm9y
+Zz90eXBlPUNFUlQFAkMVrNIFCQcvRSYACgkQ7aIelLVlcW/4KQT+IqyFzH4FIELZ
+3kQrbgPDDqwEM80Xg/maosIx9rZVsZ5Zl99VCUaAl4t9O3aa0gAZGgLJpRrNaOPb
+TorjU5/sbRlUV4LJ8/KMG0oWXA0uuMxbPuQAa0u1cX9sqezgyveUHwpckqI5OPm4
+Uj2b5vl6YAwNcnJAbcOdr9ZFx6Ckj66uudHQ91mFgG9g89jqCBy0uxe18vcT9t6z
+VcuzItbNI4j7BBMBAgBFAhsDBAsHAwIDFQIDAxYCAQIeAQIXgCIYZG5zOnNpbW9u
+Lmpvc2Vmc3Nvbi5vcmc/dHlwZT1DRVJUBQJD8yj/BQkIC2/UAAoJEO2iHpS1ZXFv
+nC8E/2m35x5385TCfpBBULbxdISP5DZcTlM9O30L+XZnn1lFVAFDQes7ZtLJfQtG
+UYzSPoA110G7ckq8YmLN46h++tV1cEdUNC/+pq+Z+hb+wGTdXL9z2cGYXH4YyUTP
+FYgqAvegFEpUQb2ApP9tOfnNlAu3gu74GUBN4AM1SVSOdyCApJdene5hCCFaplAe
+sSze2TQ3DMHFg9b3sOa1hyNI1pCI+wQTAQIARQIbAwQLBwMCAxUCAwMWAgECHgEC
+F4AiGGRuczpzaW1vbi5qb3NlZnNzb24ub3JnP3R5cGU9Q0VSVAUCRObodQUJCP8v
+SAAKCRDtoh6UtWVxb4FkBP9tBDCSdedRv15ohfH5pJsB6g7mByjDIXOWByKdpTIe
+7on/WiA7CKWShA+zGGBEToD+6eTdlpyS8GvOk3abD1idUZEL41z2q55FYoWEF8o1
+QXAwJylUjLUiMJH98DPXGVXiSknlBBfls97xNhSp8pFLqF9ZG8Fl3RJS4LWzXkjK
+qAqr1FkRCersY7PJC8xtIF5GStvga69kh3B1tH6oPY+ZiPsEEwECAEUCGwMECwcD
+AgMVAgMDFgIBAh4BAheAIhhkbnM6c2ltb24uam9zZWZzc29uLm9yZz90eXBlPUNF
+UlQFAkXV1VgFCQuT/C0ACgkQ7aIelLVlcW/oNAT7BnY+otbWxp6nuX2aKTnnmXVs
+VXS1DWFXLPplGwAp6b2rdlrm8pdj1BsXr9J4mLTBPdGmcJq7Yt7Srw9o/Lb3j9Lq
+cZYBIQP108oUMOQoDAgxgxln9ES0CucRAbFrrjeIFeZ9WM3ceoo4nmcDSXxOHTiz
+jODgj5GmhNvSYtE1V/wZxEgT1s91v0dNBYw3XP5deHgTuTpZskFf8wCk/kdLQYj7
+BBMBAgBFAhsDBAsHAwIDFQIDAxYCAQIeAQIXgCIYZG5zOnNpbW9uLmpvc2Vmc3Nv
+bi5vcmc/dHlwZT1DRVJUBQJIYfmJBQkNGHReAAoJEO2iHpS1ZXFvPh4E+wePsiIA
+/rMdtwMewEcEyNKmfcdRvbSWLJVykJ76BIMUTe2gBArDmk8IT+a38ydbYX7XfH+M
+mIDtKfTuGsZMmTjslEVSX0HCc9hDabhZpdSvIzpb2Ss4pYkyyTCn0MZqd73TCZMX
+/HtMw0cGT3wPtp1fdFj7TvH7IeMDkc/vCSPcZcxJuVpRvgqzHcKKGrxoO98IeF0X
+La5zEBp0JtNuHeKI+wQTAQIARQIbAwQLBwMCAxUCAwMWAgECHgECF4AiGGRuczpz
+aW1vbi5qb3NlZnNzb24ub3JnP3R5cGU9Q0VSVAUCSaEuAAUJDq1aTgAKCRDtoh6U
+tWVxb+lEBP9fygV0LopkxFO6SKll/LZynbNBaZiz3dPki2vlWupTiQbMjJ4aliUh
+L7uMPX+MguMrcNhAtenA05/cAHC6UthhN5flKYeTkomGL9RbTn1fq05nqWmlbbh9
+Ev3c7NfqBUEcamPip+KsvMzt6r5XIl/3eF7zOdg5Yn+/LeZdr9B0wuYgvV4L5nYD
+Ky6WkMA54gPNBtA2ps8yg2uZw7pWdnIdiPsEEwECAEUCGwMECwcDAgMVAgMDFgIB
+Ah4BAheAIhhkbnM6c2ltb24uam9zZWZzc29uLm9yZz90eXBlPUNFUlQFAknt59oF
+CQ76FCsACgkQ7aIelLVlcW9HKQT+N9SWzP9QXtBIA/eYqH6hMfSKoVF6edhFQk/7
+FejAX3VE6ZVo7M1iPd70e++3nwlUYU9iUp7TaeOPLKjdCAUsDbpwNGSuj9oc2/Ba
+zRdjzjBqncZaOa76IzsIvBpLN9TPCcuzRMaggu1pAQMiGReFmApThaxCkOGwjFdm
+cWbydb0ngO4kbeHi6BXOzy1BTTRdK3Y7ThcRFvfYodeFRZDWVoj7BBMBAgBFAhsD
+BAsHAwIDFQIDAxYCAQIeAQIXgCIYZG5zOnNpbW9uLmpvc2Vmc3Nvbi5vcmc/dHlw
+ZT1DRVJUBQJLg+AxBQkQvjD/AAoJEO2iHpS1ZXFvDAgE/AzYH40Oe01TlvH651jU
+uR2PI2EJXOgo+2SdNekXdrWjKDnjix7TIULeCbhRCGA3VT7T6prGOVzeLUPt0Dow
+NLE5D9sjeq4bRvfBT0Qd+tQDsWPhw63rhRAaOT0eKRJ1GAcybsP2l/Vh/J7seYRO
+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
+=oc2d
 -----END PGP PUBLIC KEY BLOCK-----
 
 ----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 4c71210..fc5d454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13493,8 +13493,7 @@
 
 	-----
 
-	Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-	2010, 2011 Simon Josefsson
+	Copyright (C) 2002-2012 Simon Josefsson
 
 	Copying and distribution of this file, with or without
 	modification, are permitted provided the copyright notice
diff --git a/FAQ b/FAQ
index dcea35a..e3b1f27 100644
--- a/FAQ
+++ b/FAQ
@@ -1,6 +1,5 @@
 Libidn FAQ -- Anticipated Frequently Asked Questions.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 Q#1: Why doesn't Libidn use a separate library for the Unicode
diff --git a/GNUmakefile b/GNUmakefile
index 86bc60f..f343cef 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -5,7 +5,7 @@
 # It is necessary if you want to build targets usually of interest
 # only to the maintainer.
 
-# Copyright (C) 2001, 2003, 2006-2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2006-2012 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/Makefile.am b/Makefile.am
index 2c60d76..d3a2474 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/NEWS b/NEWS
index 19f5811..55321a3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 Libidn NEWS -- History of user-visible changes.                 -*- outline -*-
-Copyright (C) 2002-2011 Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 * Version 1.24 (unreleased) [?]
@@ -7,7 +7,9 @@ See the end for copying conditions.
 ** build: Fix parallel Windows builds.
 Reported by RenÃ© Berber <r.berber@computer.org>.
 
-** Update gnulib files.
+** Sync glib NFKC code and improve copyright/license statements.
+
+** Update gnulib files and translations.
 
 ** API and ABI is backwards compatible with the previous version.
 
diff --git a/README b/README
index 152700c..135c359 100644
--- a/README
+++ b/README
@@ -1,6 +1,5 @@
 Libidn README -- Important introductory notes.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 Libidn is a package for internationalized string handling based on the
diff --git a/README-alpha b/README-alpha
index 76e9b04..843268c 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,5 +1,5 @@
 Libidn README-alpha -- Information for developers.              -*- outline -*-
-Copyright (C) 2009, 2010, 2011 Simon Josefsson
+Copyright (C) 2009-2012 Simon Josefsson
 See the end for copying conditions.
 
 This file contains instructions for developers and advanced users that
diff --git a/THANKS b/THANKS
index 89cb721..858c33e 100644
--- a/THANKS
+++ b/THANKS
@@ -1,14 +1,15 @@
 Libidn THANKS -- Acknowledgements.
-Copyright (C) 2002-2011 Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 The punycode code was taken from the IETF IDN Punycode specification,
 by Adam M. Costello.  The TLD code was contributed by Thomas Jacob.
 The Java implementation was contributed by Oliver Hitz.  The C#
 implementation was contributed by Alexander Gnauck.  The Unicode
-tables were provided by Unicode, Inc.  Some functions for dealing with
-Unicode (see nfkc.c and toutf8.c) are borrowed from GLib downloaded
-from www.gtk.org.
+tables were provided by Unicode, Inc.  Functions for dealing with
+Unicode (see lib/nfkc.c) are borrowed from GLib downloaded from
+www.gtk.org.  Gnulib is used to simplify portability and to improve
+readability of the code.
 
 Suggestions, bug reports, patches, translations, test vectors or other
 contributions were also received from or written by the people
diff --git a/TODO b/TODO
index 834f41f..19badba 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 Libidn TODO -- Future directions.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-Simon Josefsson
+Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
 If you like to start working on anything, please let me know so work
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index 8bd7f5d..c0d31f9 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2011 Free Software Foundation, Inc.
+#   Copyright 1996-2012 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
diff --git a/build-aux/csharpcomp.sh.in b/build-aux/csharpcomp.sh.in
index 8d5bd87..50cd6b2 100644
--- a/build-aux/csharpcomp.sh.in
+++ b/build-aux/csharpcomp.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Compile a C# program.
 
-# Copyright (C) 2003-2006, 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2006, 2009-2012 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/csharpexec.sh.in b/build-aux/csharpexec.sh.in
index 673df08..7e635d1 100644
--- a/build-aux/csharpexec.sh.in
+++ b/build-aux/csharpexec.sh.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Execute a C# program.
 
-# Copyright (C) 2003, 2005, 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 2009-2012 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/build-aux/pmccabe2html b/build-aux/pmccabe2html
index c7cf3d0..7cf8df7 100644
--- a/build-aux/pmccabe2html
+++ b/build-aux/pmccabe2html
@@ -1,6 +1,6 @@
 # pmccabe2html - AWK script to convert pmccabe output to html       -*- awk -*-
 
-# Copyright (C) 2007-2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 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/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h
index 6c2f1e8..3a9dd26 100644
--- a/build-aux/snippet/arg-nonnull.h
+++ b/build-aux/snippet/arg-nonnull.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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
diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h
index b6821a6..96da94b 100644
--- a/build-aux/snippet/c++defs.h
+++ b/build-aux/snippet/c++defs.h
@@ -1,5 +1,5 @@
 /* C++ compatible function declaration macros.
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2012 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
diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h
index c8d2071..1c8d61f 100644
--- a/build-aux/snippet/unused-parameter.h
+++ b/build-aux/snippet/unused-parameter.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific function parameters are not used.
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 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
diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h
index 2cdeec3..d4cb94f 100644
--- a/build-aux/snippet/warn-on-use.h
+++ b/build-aux/snippet/warn-on-use.h
@@ -1,5 +1,5 @@
 /* A C macro for emitting warnings if a function is used.
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2012 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
diff --git a/build-aux/update-copyright b/build-aux/update-copyright
index ef0b1ce..d86a12b 100755
--- a/build-aux/update-copyright
+++ b/build-aux/update-copyright
@@ -5,7 +5,7 @@ eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" ${1+"$@"}'
 
 my $VERSION = '2011-01-02.20:59'; # UTC
 
-# Copyright (C) 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 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/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index b8f5a26..b1c5902 100755
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -10,7 +10,7 @@ my $VERSION = '2011-04-20 13:43'; # UTC
 # If you change this file with Emacs, please let the write hook
 # do its job.  Otherwise, update this string manually.
 
-# Copyright (C) 2008-2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 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/build-aux/vc-list-files b/build-aux/vc-list-files
index 405e458..d477da8 100755
--- a/build-aux/vc-list-files
+++ b/build-aux/vc-list-files
@@ -4,7 +4,7 @@
 # Print a version string.
 scriptversion=2011-05-16.22; # UTC
 
-# Copyright (C) 2006-2011 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 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/cfg.mk b/cfg.mk
index 81b9548..87e94f6 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2011 Simon Josefsson
+# Copyright (C) 2006-2012 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
@@ -29,8 +29,8 @@ local-checks-to-skip = sc_prohibit_strcmp sc_prohibit_have_config_h	\
 	sc_prohibit_HAVE_MBRTOWC sc_program_name sc_trailing_blank	\
 	sc_GPL_version sc_immutable_NEWS
 VC_LIST_ALWAYS_EXCLUDE_REGEX = \
-	^(maint.mk|gtk-doc.make|m4/pkg.m4|doc/specifications|contrib/doxygen/Doxyfile|doc/fdl-1.3.texi|csharp/libidn.*suo|(lib/)?(gl|gltests|build-aux)/)
-update-copyright-env = UPDATE_COPYRIGHT_HOLDER="Simon Josefsson"
+	^(GNUmakefile|maint.mk|gtk-doc.make|m4/pkg.m4|doc/specifications|contrib/doxygen/Doxyfile|doc/gpl-3.0.texi|doc/lgpl-2.1.texi|doc/fdl-1.3.texi|csharp/libidn.*suo|(lib/)?(gl|gltests|build-aux)/)
+update-copyright-env = UPDATE_COPYRIGHT_HOLDER="Simon Josefsson" UPDATE_COPYRIGHT_USE_INTERVALS=1
 
 # Explicit syntax-check exceptions.
 exclude_file_name_regexp--sc_bindtextdomain = ^examples/|libc/|tests/
diff --git a/configure.ac b/configure.ac
index fc4c0b3..7e5a67f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl Copyright (C) 2002-2011 Simon Josefsson
+dnl Copyright (C) 2002-2012 Simon Josefsson
 dnl
 dnl This file is part of GNU Libidn.
 dnl
diff --git a/contrib/README b/contrib/README
index 64aa94a..f03b7e0 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,6 +1,5 @@
 Libidn contrib/README -- Notes for the contrib/ subdirectory.
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-Josefsson
+Copyright (C) 2003-2012 Simon Josefsson
 See the end for copying conditions.
 
 The idn-python/ sub-directory contains a Python interface for Libidn,
diff --git a/contrib/doxygen/gdoc2doxygen b/contrib/doxygen/gdoc2doxygen
index c63daec..da6e3f9 100755
--- a/contrib/doxygen/gdoc2doxygen
+++ b/contrib/doxygen/gdoc2doxygen
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2003, 2005, 2006, 2007, 2008, 2010, 2011 Simon Josefsson
+# Copyright (C) 2003-2012 Simon Josefsson
 
 # 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/contrib/java/Makefile.am b/contrib/java/Makefile.am
index d4dd993..6115dd4 100644
--- a/contrib/java/Makefile.am
+++ b/contrib/java/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2010, 2011 Simon
-# Josefsson.
+# Copyright (C) 2002-2012 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/contrib/java/README b/contrib/java/README
index 2bc8aaf..2bb8e16 100644
--- a/contrib/java/README
+++ b/contrib/java/README
@@ -1,5 +1,5 @@
 Libidn README -- Notes for the JAVA API proof of concept.
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010, 2011 Simon Josefsson
+Copyright (C) 2003-2012 Simon Josefsson
 See the end for copying conditions.
 
 This directory builds Java *.class files that implement the Libidn
diff --git a/csharp/IDNA.cs b/csharp/IDNA.cs
index 9f217cb..6c785a2 100644
--- a/csharp/IDNA.cs
+++ b/csharp/IDNA.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
 /// *
diff --git a/csharp/IDNAException.cs b/csharp/IDNAException.cs
index d9a2bea..4a8033d 100644
--- a/csharp/IDNAException.cs
+++ b/csharp/IDNAException.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
 /// *
diff --git a/csharp/Makefile.am b/csharp/Makefile.am
index bda73ab..2bf9aff 100644
--- a/csharp/Makefile.am
+++ b/csharp/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon Josefsson.
+# Copyright (C) 2005-2012 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/csharp/NFKC.cs b/csharp/NFKC.cs
index 0fffa70..5d4fb54 100644
--- a/csharp/NFKC.cs
+++ b/csharp/NFKC.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
 /// *
diff --git a/csharp/Punycode.cs b/csharp/Punycode.cs
index 410b1c6..e23c2b8 100644
--- a/csharp/Punycode.cs
+++ b/csharp/Punycode.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
 /// *
diff --git a/csharp/PunycodeException.cs b/csharp/PunycodeException.cs
index 211c198..779fb48 100644
--- a/csharp/PunycodeException.cs
+++ b/csharp/PunycodeException.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
 /// *
diff --git a/csharp/Stringprep.cs b/csharp/Stringprep.cs
index ea41439..8156d90 100644
--- a/csharp/Stringprep.cs
+++ b/csharp/Stringprep.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
 /// *
diff --git a/csharp/StringprepException.cs b/csharp/StringprepException.cs
index 35328cf..edb39bc 100644
--- a/csharp/StringprepException.cs
+++ b/csharp/StringprepException.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
 /// *
diff --git a/csharp/generate/AssemblyInfo.cs b/csharp/generate/AssemblyInfo.cs
index 1d7e404..92642c8 100644
--- a/csharp/generate/AssemblyInfo.cs
+++ b/csharp/generate/AssemblyInfo.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software
 /// *
diff --git a/csharp/generate/GenerateNFKC.cs b/csharp/generate/GenerateNFKC.cs
index fd71704..ca68c80 100644
--- a/csharp/generate/GenerateNFKC.cs
+++ b/csharp/generate/GenerateNFKC.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software
 /// *
diff --git a/csharp/generate/GenerateRFC3454.cs b/csharp/generate/GenerateRFC3454.cs
index 71825d4..60696a9 100644
--- a/csharp/generate/GenerateRFC3454.cs
+++ b/csharp/generate/GenerateRFC3454.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software
 /// *
diff --git a/csharp/generate/HashSet.cs b/csharp/generate/HashSet.cs
index b8763e2..c9ea7bc 100644
--- a/csharp/generate/HashSet.cs
+++ b/csharp/generate/HashSet.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software
 /// *
diff --git a/csharp/generate/Program.cs b/csharp/generate/Program.cs
index 1a69961..0685e40 100644
--- a/csharp/generate/Program.cs
+++ b/csharp/generate/Program.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-/// Software Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software
 /// *
diff --git a/csharp/generate/Tokenizer.cs b/csharp/generate/Tokenizer.cs
index b482654..a4db4ac 100644
--- a/csharp/generate/Tokenizer.cs
+++ b/csharp/generate/Tokenizer.cs
@@ -1,6 +1,5 @@
 /// <summary>
-/// Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-/// Foundation, Inc.
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
 /// *
 /// Author: Alexander Gnauck AG-Software
 /// *
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 968f280..2b42b3b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002-2011 Simon Josefsson.
+# Copyright (C) 2002-2012 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/doc/Makefile.gdoci b/doc/Makefile.gdoci
index 8acd51b..0198095 100644
--- a/doc/Makefile.gdoci
+++ b/doc/Makefile.gdoci
@@ -1,6 +1,5 @@
 # -*- makefile -*-
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/doc/cyclo/Makefile.am b/doc/cyclo/Makefile.am
index a0ccf7b..21dc67f 100644
--- a/doc/cyclo/Makefile.am
+++ b/doc/cyclo/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2008-2011 Simon Josefsson.
+# Copyright (C) 2008-2012 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/doc/gdoc b/doc/gdoc
index 975a85d..5012c3c 100755
--- a/doc/gdoc
+++ b/doc/gdoc
@@ -3,7 +3,7 @@ eval '(exit $?0)' && eval 'exec perl -S "$0" ${1+"$@"}'
     if 0;
 # Generate documentation from source code.
 
-## Copyright (c) 2002-2011 Simon Josefsson
+## Copyright (c) 2002-2012 Simon Josefsson
 ##                    added -texinfo, -listfunc, -pkg-name
 ##                    man page revamp
 ##                    various improvements
diff --git a/doc/gendocs_template b/doc/gendocs_template
index 1288e7a..4fbf1c5 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -99,7 +99,7 @@ the FSF.<br />
 Please send broken links and other corrections or suggestions to
 <a href="mailto:%%EMAIL%%">&lt;%%EMAIL%%&gt;</a>.</p>
 
-<p>Copyright &copy; 2011 Free Software Foundation, Inc.</p>
+<p>Copyright &copy; 2012 Free Software Foundation, Inc.</p>
 
 <p>Verbatim copying and distribution of this entire article are
 permitted worldwide, without royalty, in any medium, provided this
diff --git a/doc/java/Makefile.am b/doc/java/Makefile.am
index ebe5030..d4b5b2c 100644
--- a/doc/java/Makefile.am
+++ b/doc/java/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-# Josefsson
+# Copyright (C) 2004-2012 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/doc/libidn.texi b/doc/libidn.texi
index ee47442..67258e2 100644
--- a/doc/libidn.texi
+++ b/doc/libidn.texi
@@ -14,8 +14,7 @@
 This manual is last updated @value{UPDATED} for version
 @value{VERSION} of GNU Libidn.
 
-Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-2010, 2011 Simon Josefsson.
+Copyright @copyright{} 2002-2012 Simon Josefsson.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/tld/Makefile.am b/doc/tld/Makefile.am
index 686eda8..5a3b1ae 100644
--- a/doc/tld/Makefile.am
+++ b/doc/tld/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-# Josefsson.
+# Copyright (C) 2004-2012 Simon Josefsson.
 # Copyright (C) 2004  Free Software Foundation, Inc
 #
 # This file is part of GNU Libidn.
diff --git a/doc/tld/README b/doc/tld/README
index 02bed1e..4e76040 100644
--- a/doc/tld/README
+++ b/doc/tld/README
@@ -1,6 +1,5 @@
 Libidn doc/tld/README -- Notes and definition of the TLD tables.
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-Josefsson
+Copyright (C) 2004-2012 Simon Josefsson
 Copyright (C) 2004  Free Software Foundation, Inc
 See the end for copying conditions.
 
diff --git a/doc/tld/fr.tld b/doc/tld/fr.tld
index bf610ce..c724f46 100644
--- a/doc/tld/fr.tld
+++ b/doc/tld/fr.tld
@@ -1,4 +1,4 @@
-# Copyright (C) 2004, 2010, 2011 Simon Josefsson
+# Copyright (C) 2004-2012 Simon Josefsson
 # Copyright (C) 2003 Stephane Bortzmeyer <bortzmeyer@nic.fr> / AFNIC
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/doc/tld/no.tld b/doc/tld/no.tld
index 9cfc3ba..6ee80b3 100644
--- a/doc/tld/no.tld
+++ b/doc/tld/no.tld
@@ -1,4 +1,4 @@
-# Copyright (C) 2003, 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 # Author: Thomas Jacob, Internet24.de.
 
 # Copying and distribution of this file, with or without modification,
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 59ceb98..31a79d2 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011
-# Simon Josefsson.
+# Copyright (C) 2002-2012 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/examples/README b/examples/README
index 2de2784..7d772bd 100644
--- a/examples/README
+++ b/examples/README
@@ -1,6 +1,5 @@
 Libidn examples/README -- Information about files in examples/ directory.
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-Josefsson
+Copyright (C) 2003-2012 Simon Josefsson
 See the end for copying conditions.
 
 This directory contains examples on how to use Libidn.
diff --git a/examples/example.c b/examples/example.c
index 4dbd91c..8edcd9b 100644
--- a/examples/example.c
+++ b/examples/example.c
@@ -1,6 +1,5 @@
 /* example.c --- Example code showing how to use stringprep().
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/examples/example2.c b/examples/example2.c
index b0fce18..e5b1975 100644
--- a/examples/example2.c
+++ b/examples/example2.c
@@ -1,6 +1,5 @@
 /* example2.c --- Example code showing how to use punycode.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  * Copyright (C) 2002  Adam M. Costello
  *
  * This file is part of GNU Libidn.
diff --git a/examples/example3.c b/examples/example3.c
index a5ae440..621e8b3 100644
--- a/examples/example3.c
+++ b/examples/example3.c
@@ -1,6 +1,5 @@
 /* example3.c --- Example ToASCII() code showing how to use Libidn.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/examples/example4.c b/examples/example4.c
index 344a280..dbfb935 100644
--- a/examples/example4.c
+++ b/examples/example4.c
@@ -1,6 +1,5 @@
 /* example4.c --- Example ToUnicode() code showing how to use Libidn.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/examples/example5.c b/examples/example5.c
index 7f553c3..5eb4188 100644
--- a/examples/example5.c
+++ b/examples/example5.c
@@ -1,6 +1,5 @@
 /* example5.c --- Example TLD checking.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/gl/Makefile.am b/gl/Makefile.am
index ef51635..e63f896 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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
@@ -494,6 +494,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
 	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
 	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
+	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
 	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
 	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
 	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
@@ -506,6 +507,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
 	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
 	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
+	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
 	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
 	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
 	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
@@ -543,6 +545,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
+	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
@@ -555,6 +558,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
+	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
@@ -569,6 +573,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
diff --git a/gl/errno.in.h b/gl/errno.in.h
index b6014b4..5271bcd 100644
--- a/gl/errno.in.h
+++ b/gl/errno.in.h
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 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/gl/error.c b/gl/error.c
index 5ebe8bf..b253ef7 100644
--- a/gl/error.c
+++ b/gl/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gl/error.h b/gl/error.h
index 80f81bc..5bcdf0d 100644
--- a/gl/error.h
+++ b/gl/error.h
@@ -1,5 +1,5 @@
 /* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2011 Free Software Foundation,
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2012 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/getopt.c b/gl/getopt.c
index 7c9f704..807375a 100644
--- a/gl/getopt.c
+++ b/gl/getopt.c
@@ -2,7 +2,7 @@
    NOTE: getopt is part of the C library, so if you don't know what
    "Keep this file name-space clean" means, talk to drepper@gnu.org
    before changing it!
-   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2011 Free Software
+   Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2012 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/getopt.in.h b/gl/getopt.in.h
index 0f3918a..1bf2afe 100644
--- a/gl/getopt.in.h
+++ b/gl/getopt.in.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2011 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2012 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/getopt1.c b/gl/getopt1.c
index 3656802..7cf41c8 100644
--- a/gl/getopt1.c
+++ b/gl/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2011 Free Software
+   Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2012 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/getopt_int.h b/gl/getopt_int.h
index 9f0c713..3c37544 100644
--- a/gl/getopt_int.h
+++ b/gl/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2011 Free Software
+   Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2012 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/gettext.h b/gl/gettext.h
index 64762d5..4fb025b 100644
--- a/gl/gettext.h
+++ b/gl/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2012 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gl/intprops.h b/gl/intprops.h
index 1f6a539..2485c78 100644
--- a/gl/intprops.h
+++ b/gl/intprops.h
@@ -1,6 +1,6 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2005, 2009-2012 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/gl/m4/00gnulib.m4 b/gl/m4/00gnulib.m4
index 7feed46..d978cb8 100644
--- a/gl/m4/00gnulib.m4
+++ b/gl/m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 2
-dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2012 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/gl/m4/alloca.m4 b/gl/m4/alloca.m4
index a8744a8..8579bff 100644
--- a/gl/m4/alloca.m4
+++ b/gl/m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 13
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2011 Free Software Foundation,
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2012 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/gl/m4/autobuild.m4 b/gl/m4/autobuild.m4
index 04971d4..284dc60 100644
--- a/gl/m4/autobuild.m4
+++ b/gl/m4/autobuild.m4
@@ -1,5 +1,5 @@
 # autobuild.m4 serial 7
-dnl Copyright (C) 2004, 2006-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006-2012 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/gl/m4/close.m4 b/gl/m4/close.m4
index f860a32..379e70d 100644
--- a/gl/m4/close.m4
+++ b/gl/m4/close.m4
@@ -1,5 +1,5 @@
 # close.m4 serial 8
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2012 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/gl/m4/csharp.m4 b/gl/m4/csharp.m4
index ba1d4a6..6ec3223 100644
--- a/gl/m4/csharp.m4
+++ b/gl/m4/csharp.m4
@@ -1,5 +1,5 @@
 # csharp.m4 serial 3
-dnl Copyright (C) 2004-2005, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2012 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/gl/m4/csharpcomp.m4 b/gl/m4/csharpcomp.m4
index 03d5281..dc7c588 100644
--- a/gl/m4/csharpcomp.m4
+++ b/gl/m4/csharpcomp.m4
@@ -1,5 +1,5 @@
 # csharpcomp.m4 serial 8
-dnl Copyright (C) 2003-2005, 2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2007, 2009-2012 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/gl/m4/csharpexec.m4 b/gl/m4/csharpexec.m4
index 00396e9..fab2611 100644
--- a/gl/m4/csharpexec.m4
+++ b/gl/m4/csharpexec.m4
@@ -1,5 +1,5 @@
 # csharpexec.m4 serial 4
-dnl Copyright (C) 2003-2005, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2012 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/gl/m4/dup2.m4 b/gl/m4/dup2.m4
index 1543282..dec27fa 100644
--- a/gl/m4/dup2.m4
+++ b/gl/m4/dup2.m4
@@ -1,5 +1,5 @@
 #serial 17
-dnl Copyright (C) 2002, 2005, 2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005, 2007, 2009-2012 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/gl/m4/eealloc.m4 b/gl/m4/eealloc.m4
index 3006c48..75f17e2 100644
--- a/gl/m4/eealloc.m4
+++ b/gl/m4/eealloc.m4
@@ -1,5 +1,5 @@
 # eealloc.m4 serial 2
-dnl Copyright (C) 2003, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2012 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/gl/m4/environ.m4 b/gl/m4/environ.m4
index 6c7982f..8eb57c9 100644
--- a/gl/m4/environ.m4
+++ b/gl/m4/environ.m4
@@ -1,5 +1,5 @@
 # environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2012 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/gl/m4/errno_h.m4 b/gl/m4/errno_h.m4
index 560adba..4f0bb83 100644
--- a/gl/m4/errno_h.m4
+++ b/gl/m4/errno_h.m4
@@ -1,5 +1,5 @@
 # errno_h.m4 serial 10
-dnl Copyright (C) 2004, 2006, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2008-2012 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/gl/m4/error.m4 b/gl/m4/error.m4
index e7022fe..5d9c70a 100644
--- a/gl/m4/error.m4
+++ b/gl/m4/error.m4
@@ -1,6 +1,6 @@
 #serial 14
 
-# Copyright (C) 1996-1998, 2001-2004, 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-1998, 2001-2004, 2009-2012 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/gl/m4/extensions.m4 b/gl/m4/extensions.m4
index 22156e0..94741cd 100644
--- a/gl/m4/extensions.m4
+++ b/gl/m4/extensions.m4
@@ -1,7 +1,7 @@
 # serial 10  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2012 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/gl/m4/fcntl-o.m4 b/gl/m4/fcntl-o.m4
index bee6edc..9862741 100644
--- a/gl/m4/fcntl-o.m4
+++ b/gl/m4/fcntl-o.m4
@@ -1,5 +1,5 @@
 # fcntl-o.m4 serial 4
-dnl Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2012 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/gl/m4/fcntl_h.m4 b/gl/m4/fcntl_h.m4
index 03a41e6..cac28ae 100644
--- a/gl/m4/fcntl_h.m4
+++ b/gl/m4/fcntl_h.m4
@@ -1,6 +1,6 @@
 # serial 15
 # Configure fcntl.h.
-dnl Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2012 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/gl/m4/fdopen.m4 b/gl/m4/fdopen.m4
index 8cae2fc..9ca9d2a 100644
--- a/gl/m4/fdopen.m4
+++ b/gl/m4/fdopen.m4
@@ -1,5 +1,5 @@
 # fdopen.m4 serial 2
-dnl Copyright (C) 2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2012 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/gl/m4/fstat.m4 b/gl/m4/fstat.m4
index 0daea88..e3f8f3e 100644
--- a/gl/m4/fstat.m4
+++ b/gl/m4/fstat.m4
@@ -1,5 +1,5 @@
 # fstat.m4 serial 1
-dnl Copyright (C) 2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2012 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/gl/m4/getcwd.m4 b/gl/m4/getcwd.m4
index 8f3af32..ccb1f47 100644
--- a/gl/m4/getcwd.m4
+++ b/gl/m4/getcwd.m4
@@ -1,6 +1,6 @@
 # getcwd.m4 - check for working getcwd that is compatible with glibc
 
-# Copyright (C) 2001, 2003-2007, 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003-2007, 2009-2012 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/gl/m4/getopt.m4 b/gl/m4/getopt.m4
index 8ec6e79..2aea895 100644
--- a/gl/m4/getopt.m4
+++ b/gl/m4/getopt.m4
@@ -1,5 +1,5 @@
 # getopt.m4 serial 39
-dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008-2012 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/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index df4f7c4..453963b 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index 8621dec..d1be9e6 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
 # gnulib-common.m4 serial 31
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 48269c9..e2c8dee 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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
@@ -140,6 +140,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module symlink:
   # Code from module symlink-tests:
   # Code from module sys_stat:
+  # Code from module test-framework-sh:
+  # Code from module test-framework-sh-tests:
   # Code from module time:
   # Code from module unistd:
   # Code from module unsetenv:
@@ -605,6 +607,7 @@ AC_DEFUN([gl_FILE_LIST], [
   tests/test-getopt.h
   tests/test-getopt_long.h
   tests/test-ignore-value.c
+  tests/test-init.sh
   tests/test-intprops.c
   tests/test-inttypes.c
   tests/test-lstat.c
diff --git a/gl/m4/gnulib-tool.m4 b/gl/m4/gnulib-tool.m4
index ed41e9d..a09ffc1 100644
--- a/gl/m4/gnulib-tool.m4
+++ b/gl/m4/gnulib-tool.m4
@@ -1,5 +1,5 @@
 # gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2012 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/gl/m4/include_next.m4 b/gl/m4/include_next.m4
index 8a1fab6..6593e03 100644
--- a/gl/m4/include_next.m4
+++ b/gl/m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 23
-dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2012 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/gl/m4/inttypes-pri.m4 b/gl/m4/inttypes-pri.m4
index e252b27..977206f 100644
--- a/gl/m4/inttypes-pri.m4
+++ b/gl/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
 # inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2002, 2006, 2008-2012 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/gl/m4/inttypes.m4 b/gl/m4/inttypes.m4
index cc027a4..989c261 100644
--- a/gl/m4/inttypes.m4
+++ b/gl/m4/inttypes.m4
@@ -1,5 +1,5 @@
-# inttypes.m4 serial 24
-dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
+# inttypes.m4 serial 25
+dnl Copyright (C) 2006-2012 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.
@@ -24,22 +24,6 @@ AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE],
 
   AC_REQUIRE([gl_MULTIARCH])
 
-  dnl Ensure that <stdint.h> defines the limit macros, since gnulib's
-  dnl <inttypes.h> relies on them.  This macro is only needed when a
-  dnl C++ compiler is in use; it has no effect for a C compiler.
-  dnl Also be careful to define __STDC_LIMIT_MACROS only when gnulib's
-  dnl <inttypes.h> is going to be created, and to avoid redefinition warnings
-  dnl if the __STDC_LIMIT_MACROS is already defined through the CPPFLAGS.
-  AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], [1],
-    [Define to make the limit macros in <stdint.h> visible.])
-  AH_VERBATIM([__STDC_LIMIT_MACROS_ZZZ],
-[/* Ensure that <stdint.h> defines the limit macros, since gnulib's
-   <inttypes.h> relies on them.  */
-#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && GL_TRIGGER_STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-#endif
-])
-
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[#include <inttypes.h>
diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
index d83fea1..1369bbe 100644
--- a/gl/m4/largefile.m4
+++ b/gl/m4/largefile.m4
@@ -1,6 +1,6 @@
 # Enable large files on systems where this is not the default.
 
-# Copyright 1992-1996, 1998-2011 Free Software Foundation, Inc.
+# Copyright 1992-1996, 1998-2012 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/gl/m4/longlong.m4 b/gl/m4/longlong.m4
index aed816c..42a19ac 100644
--- a/gl/m4/longlong.m4
+++ b/gl/m4/longlong.m4
@@ -1,5 +1,5 @@
 # longlong.m4 serial 16
-dnl Copyright (C) 1999-2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2012 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/gl/m4/lstat.m4 b/gl/m4/lstat.m4
index fe161d4..f41a2df 100644
--- a/gl/m4/lstat.m4
+++ b/gl/m4/lstat.m4
@@ -1,6 +1,6 @@
 # serial 23
 
-# Copyright (C) 1997-2001, 2003-2011 Free Software Foundation, Inc.
+# Copyright (C) 1997-2001, 2003-2012 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/gl/m4/malloc.m4 b/gl/m4/malloc.m4
index 87018ec..d3c39f5 100644
--- a/gl/m4/malloc.m4
+++ b/gl/m4/malloc.m4
@@ -1,5 +1,5 @@
 # malloc.m4 serial 13
-dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2012 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/gl/m4/malloca.m4 b/gl/m4/malloca.m4
index aec43f5..7841979 100644
--- a/gl/m4/malloca.m4
+++ b/gl/m4/malloca.m4
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2011 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2012 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/gl/m4/manywarnings.m4 b/gl/m4/manywarnings.m4
index be68659..fd0e372 100644
--- a/gl/m4/manywarnings.m4
+++ b/gl/m4/manywarnings.m4
@@ -1,5 +1,5 @@
 # manywarnings.m4 serial 3
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2012 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/gl/m4/mode_t.m4 b/gl/m4/mode_t.m4
index f9cf704..40f612a 100644
--- a/gl/m4/mode_t.m4
+++ b/gl/m4/mode_t.m4
@@ -1,5 +1,5 @@
 # mode_t.m4 serial 2
-dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2012 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/gl/m4/msvc-inval.m4 b/gl/m4/msvc-inval.m4
index fb797f0..8db4617 100644
--- a/gl/m4/msvc-inval.m4
+++ b/gl/m4/msvc-inval.m4
@@ -1,5 +1,5 @@
 # msvc-inval.m4 serial 1
-dnl Copyright (C) 2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2012 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/gl/m4/msvc-nothrow.m4 b/gl/m4/msvc-nothrow.m4
index b2f6bb4..0125050 100644
--- a/gl/m4/msvc-nothrow.m4
+++ b/gl/m4/msvc-nothrow.m4
@@ -1,5 +1,5 @@
 # msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2012 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/gl/m4/multiarch.m4 b/gl/m4/multiarch.m4
index 691d892..b424dce 100644
--- a/gl/m4/multiarch.m4
+++ b/gl/m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 6
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2012 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/gl/m4/nocrash.m4 b/gl/m4/nocrash.m4
index 60aad95..08ef825 100644
--- a/gl/m4/nocrash.m4
+++ b/gl/m4/nocrash.m4
@@ -1,5 +1,5 @@
 # nocrash.m4 serial 3
-dnl Copyright (C) 2005, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2012 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/gl/m4/open.m4 b/gl/m4/open.m4
index d819184..c85971d 100644
--- a/gl/m4/open.m4
+++ b/gl/m4/open.m4
@@ -1,5 +1,5 @@
 # open.m4 serial 13
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/gl/m4/pathmax.m4 b/gl/m4/pathmax.m4
index 4913fa0..0117861 100644
--- a/gl/m4/pathmax.m4
+++ b/gl/m4/pathmax.m4
@@ -1,5 +1,5 @@
 # pathmax.m4 serial 10
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2012 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/gl/m4/putenv.m4 b/gl/m4/putenv.m4
index 1497b4a..1cb23a5 100644
--- a/gl/m4/putenv.m4
+++ b/gl/m4/putenv.m4
@@ -1,5 +1,5 @@
 # putenv.m4 serial 18
-dnl Copyright (C) 2002-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2012 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/gl/m4/setenv.m4 b/gl/m4/setenv.m4
index bc215a6..a1f30bc 100644
--- a/gl/m4/setenv.m4
+++ b/gl/m4/setenv.m4
@@ -1,5 +1,5 @@
 # setenv.m4 serial 25
-dnl Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2012 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/gl/m4/ssize_t.m4 b/gl/m4/ssize_t.m4
index d712752..209d64c 100644
--- a/gl/m4/ssize_t.m4
+++ b/gl/m4/ssize_t.m4
@@ -1,5 +1,5 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2012 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/gl/m4/stat.m4 b/gl/m4/stat.m4
index c63f59f..d67dbcd 100644
--- a/gl/m4/stat.m4
+++ b/gl/m4/stat.m4
@@ -1,6 +1,6 @@
 # serial 8
 
-# Copyright (C) 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 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/gl/m4/stdarg.m4 b/gl/m4/stdarg.m4
index 5705de9..5c313cb 100644
--- a/gl/m4/stdarg.m4
+++ b/gl/m4/stdarg.m4
@@ -1,5 +1,5 @@
 # stdarg.m4 serial 6
-dnl Copyright (C) 2006, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2012 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/gl/m4/stdbool.m4 b/gl/m4/stdbool.m4
index 1ebf3e6..eabfa64 100644
--- a/gl/m4/stdbool.m4
+++ b/gl/m4/stdbool.m4
@@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2012 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/gl/m4/stddef_h.m4 b/gl/m4/stddef_h.m4
index 1ae2344..cc11609 100644
--- a/gl/m4/stddef_h.m4
+++ b/gl/m4/stddef_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
 # stddef_h.m4 serial 4
-dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2012 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/gl/m4/stdint.m4 b/gl/m4/stdint.m4
index 092161c..28d342e 100644
--- a/gl/m4/stdint.m4
+++ b/gl/m4/stdint.m4
@@ -1,5 +1,5 @@
-# stdint.m4 serial 41
-dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
+# stdint.m4 serial 43
+dnl Copyright (C) 2001-2012 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.
@@ -69,8 +69,6 @@ AC_DEFUN_ONCE([gl_STDINT_H],
       [gl_cv_header_working_stdint_h=no
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([[
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
@@ -219,8 +217,6 @@ struct s {
           dnl This detects a bug on HP-UX 11.23/ia64.
           AC_RUN_IFELSE([
             AC_LANG_PROGRAM([[
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 ]
diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4
index 39bf80e..1973e8d 100644
--- a/gl/m4/stdio_h.m4
+++ b/gl/m4/stdio_h.m4
@@ -1,5 +1,5 @@
 # stdio_h.m4 serial 40
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/gl/m4/stdlib_h.m4 b/gl/m4/stdlib_h.m4
index 0a8a9e5..bcb4cb8 100644
--- a/gl/m4/stdlib_h.m4
+++ b/gl/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
 # stdlib_h.m4 serial 39
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/gl/m4/strerror.m4 b/gl/m4/strerror.m4
index ca05be6..6bf14ef 100644
--- a/gl/m4/strerror.m4
+++ b/gl/m4/strerror.m4
@@ -1,5 +1,5 @@
 # strerror.m4 serial 16
-dnl Copyright (C) 2002, 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2012 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/gl/m4/string_h.m4 b/gl/m4/string_h.m4
index 4f9f511..5677e09 100644
--- a/gl/m4/string_h.m4
+++ b/gl/m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 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/gl/m4/symlink.m4 b/gl/m4/symlink.m4
index 680c14f..f84b21e 100644
--- a/gl/m4/symlink.m4
+++ b/gl/m4/symlink.m4
@@ -1,7 +1,7 @@
 # serial 5
 # See if we need to provide symlink replacement.
 
-dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2012 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/gl/m4/sys_socket_h.m4 b/gl/m4/sys_socket_h.m4
index 7da91a4..8d4e7e1 100644
--- a/gl/m4/sys_socket_h.m4
+++ b/gl/m4/sys_socket_h.m4
@@ -1,5 +1,5 @@
 # sys_socket_h.m4 serial 22
-dnl Copyright (C) 2005-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2012 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/gl/m4/sys_stat_h.m4 b/gl/m4/sys_stat_h.m4
index 83ebac6..a0b96bc 100644
--- a/gl/m4/sys_stat_h.m4
+++ b/gl/m4/sys_stat_h.m4
@@ -1,5 +1,5 @@
 # sys_stat_h.m4 serial 26   -*- Autoconf -*-
-dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2012 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/gl/m4/time_h.m4 b/gl/m4/time_h.m4
index 3454b23..dd4b522 100644
--- a/gl/m4/time_h.m4
+++ b/gl/m4/time_h.m4
@@ -1,6 +1,6 @@
 # Configure a more-standard replacement for <time.h>.
 
-# Copyright (C) 2000-2001, 2003-2007, 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2012 Free Software Foundation, Inc.
 
 # serial 6
 
diff --git a/gl/m4/unistd_h.m4 b/gl/m4/unistd_h.m4
index b4eca68..7595534 100644
--- a/gl/m4/unistd_h.m4
+++ b/gl/m4/unistd_h.m4
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 62
-dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
+# unistd_h.m4 serial 63
+dnl Copyright (C) 2006-2012 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.
@@ -41,10 +41,11 @@ AC_DEFUN([gl_UNISTD_H],
 #endif
     ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat
     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups
-    gethostname getlogin getlogin_r getpagesize getusershell setusershell
-    endusershell group_member lchown link linkat lseek pipe pipe2 pread pwrite
-    readlink readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat
-    usleep])
+    gethostname getlogin getlogin_r getpagesize
+    getusershell setusershell endusershell
+    group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
+    readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r
+    unlink unlinkat usleep])
 ])
 
 AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
@@ -82,6 +83,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   GNULIB_GETPAGESIZE=0;          AC_SUBST([GNULIB_GETPAGESIZE])
   GNULIB_GETUSERSHELL=0;         AC_SUBST([GNULIB_GETUSERSHELL])
   GNULIB_GROUP_MEMBER=0;         AC_SUBST([GNULIB_GROUP_MEMBER])
+  GNULIB_ISATTY=0;               AC_SUBST([GNULIB_ISATTY])
   GNULIB_LCHOWN=0;               AC_SUBST([GNULIB_LCHOWN])
   GNULIB_LINK=0;                 AC_SUBST([GNULIB_LINK])
   GNULIB_LINKAT=0;               AC_SUBST([GNULIB_LINKAT])
@@ -94,6 +96,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   GNULIB_READLINK=0;             AC_SUBST([GNULIB_READLINK])
   GNULIB_READLINKAT=0;           AC_SUBST([GNULIB_READLINKAT])
   GNULIB_RMDIR=0;                AC_SUBST([GNULIB_RMDIR])
+  GNULIB_SETHOSTNAME=0;          AC_SUBST([GNULIB_SETHOSTNAME])
   GNULIB_SLEEP=0;                AC_SUBST([GNULIB_SLEEP])
   GNULIB_SYMLINK=0;              AC_SUBST([GNULIB_SYMLINK])
   GNULIB_SYMLINKAT=0;            AC_SUBST([GNULIB_SYMLINKAT])
@@ -130,6 +133,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_PWRITE=1;          AC_SUBST([HAVE_PWRITE])
   HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
   HAVE_READLINKAT=1;      AC_SUBST([HAVE_READLINKAT])
+  HAVE_SETHOSTNAME=1;     AC_SUBST([HAVE_SETHOSTNAME])
   HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
   HAVE_SYMLINK=1;         AC_SUBST([HAVE_SYMLINK])
   HAVE_SYMLINKAT=1;       AC_SUBST([HAVE_SYMLINKAT])
@@ -142,6 +146,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
   HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
   HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
+  HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME])
   HAVE_DECL_TTYNAME_R=1;  AC_SUBST([HAVE_DECL_TTYNAME_R])
   HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
   HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])
@@ -155,6 +160,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_GETLOGIN_R=0;   AC_SUBST([REPLACE_GETLOGIN_R])
   REPLACE_GETGROUPS=0;    AC_SUBST([REPLACE_GETGROUPS])
   REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
+  REPLACE_ISATTY=0;       AC_SUBST([REPLACE_ISATTY])
   REPLACE_LCHOWN=0;       AC_SUBST([REPLACE_LCHOWN])
   REPLACE_LINK=0;         AC_SUBST([REPLACE_LINK])
   REPLACE_LINKAT=0;       AC_SUBST([REPLACE_LINKAT])
diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index 0a2a9a8..6f2790e 100644
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -1,5 +1,5 @@
 # valgrind-tests.m4 serial 3
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2012 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/gl/m4/version-etc.m4 b/gl/m4/version-etc.m4
index 5032bf8..4c6c678 100644
--- a/gl/m4/version-etc.m4
+++ b/gl/m4/version-etc.m4
@@ -1,5 +1,5 @@
 # version-etc.m4 serial 1
-# Copyright (C) 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 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/gl/m4/warn-on-use.m4 b/gl/m4/warn-on-use.m4
index f09deef..03b113c 100644
--- a/gl/m4/warn-on-use.m4
+++ b/gl/m4/warn-on-use.m4
@@ -1,5 +1,5 @@
 # warn-on-use.m4 serial 4
-dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2012 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/gl/m4/warnings.m4 b/gl/m4/warnings.m4
index a4a750a..69d05a6 100644
--- a/gl/m4/warnings.m4
+++ b/gl/m4/warnings.m4
@@ -1,5 +1,5 @@
 # warnings.m4 serial 5
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2012 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/gl/m4/wchar_h.m4 b/gl/m4/wchar_h.m4
index 977491f..c7a8b2d 100644
--- a/gl/m4/wchar_h.m4
+++ b/gl/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-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/gl/m4/wchar_t.m4 b/gl/m4/wchar_t.m4
index d2c03c4..534735d 100644
--- a/gl/m4/wchar_t.m4
+++ b/gl/m4/wchar_t.m4
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2012 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/gl/m4/wint_t.m4 b/gl/m4/wint_t.m4
index da1ce3d..3260cce 100644
--- a/gl/m4/wint_t.m4
+++ b/gl/m4/wint_t.m4
@@ -1,5 +1,5 @@
 # wint_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2012 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/gl/msvc-inval.c b/gl/msvc-inval.c
index d10099e..25374b7 100644
--- a/gl/msvc-inval.c
+++ b/gl/msvc-inval.c
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gl/msvc-inval.h b/gl/msvc-inval.h
index 393272e..88aa26b 100644
--- a/gl/msvc-inval.h
+++ b/gl/msvc-inval.h
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gl/msvc-nothrow.c b/gl/msvc-nothrow.c
index 8965140..178288f 100644
--- a/gl/msvc-nothrow.c
+++ b/gl/msvc-nothrow.c
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gl/msvc-nothrow.h b/gl/msvc-nothrow.h
index 462fb67..e066b24 100644
--- a/gl/msvc-nothrow.h
+++ b/gl/msvc-nothrow.h
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gl/progname.c b/gl/progname.c
index 2465748..bdd4dd7 100644
--- a/gl/progname.c
+++ b/gl/progname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2003, 2005-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2005-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gl/progname.h b/gl/progname.h
index d939e56..bb5e989 100644
--- a/gl/progname.h
+++ b/gl/progname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2001-2004, 2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gl/stdarg.in.h b/gl/stdarg.in.h
index 43f9607..3e0e43f 100644
--- a/gl/stdarg.in.h
+++ b/gl/stdarg.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <stdarg.h>.
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 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/gl/stddef.in.h b/gl/stddef.in.h
index c7b98e7..65e1775 100644
--- a/gl/stddef.in.h
+++ b/gl/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gl/strerror-override.c b/gl/strerror-override.c
index 4e2c32b..9ca6523 100644
--- a/gl/strerror-override.c
+++ b/gl/strerror-override.c
@@ -1,6 +1,6 @@
 /* strerror-override.c --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2012 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/gl/strerror-override.h b/gl/strerror-override.h
index 09540b9..09526ea 100644
--- a/gl/strerror-override.h
+++ b/gl/strerror-override.h
@@ -1,6 +1,6 @@
 /* strerror-override.h --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2012 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/gl/strerror.c b/gl/strerror.c
index 63899ca..587bd21 100644
--- a/gl/strerror.c
+++ b/gl/strerror.c
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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/gl/string.in.h b/gl/string.in.h
index 62d7994..93f70de 100644
--- a/gl/string.in.h
+++ b/gl/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2012 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/gl/unistd.in.h b/gl/unistd.in.h
index 77e5675..6aac9c3 100644
--- a/gl/unistd.in.h
+++ b/gl/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003-2012 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
@@ -935,6 +935,27 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - "
 #endif
 
 
+#if @GNULIB_ISATTY@
+# if @REPLACE_ISATTY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef isatty
+#   define isatty rpl_isatty
+#  endif
+_GL_FUNCDECL_RPL (isatty, int, (int fd));
+_GL_CXXALIAS_RPL (isatty, int, (int fd));
+# else
+_GL_CXXALIAS_SYS (isatty, int, (int fd));
+# endif
+_GL_CXXALIASWARN (isatty);
+#elif defined GNULIB_POSIXCHECK
+# undef isatty
+# if HAVE_RAW_DECL_ISATTY
+_GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - "
+                 "use gnulib module isatty for portability");
+# endif
+#endif
+
+
 #if @GNULIB_LCHOWN@
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Do not follow symbolic links.
@@ -1268,6 +1289,33 @@ _GL_WARN_ON_USE (rmdir, "rmdir is unportable - "
 #endif
 
 
+#if @GNULIB_SETHOSTNAME@
+/* Set the host name of the machine.
+   The host name may or may not be fully qualified.
+
+   Put LEN bytes of NAME into the host name.
+   Return 0 if successful, otherwise, set errno and return -1.
+
+   Platforms with no ability to set the hostname return -1 and set
+   errno = ENOSYS.  */
+# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
+_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
+                                    _GL_ARG_NONNULL ((1)));
+# endif
+/* Need to cast, because on Solaris 11 2011-10, MacOS X 10.5, IRIX 6.5
+   and FreeBSD 6.4 the second parameter is int.  On Solaris 11
+   2011-10, the first parameter is not const.  */
+_GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
+_GL_CXXALIASWARN (sethostname);
+#elif defined GNULIB_POSIXCHECK
+# undef sethostname
+# if HAVE_RAW_DECL_SETHOSTNAME
+_GL_WARN_ON_USE (sethostname, "sethostname is unportable - "
+                 "use gnulib module sethostname for portability");
+# endif
+#endif
+
+
 #if @GNULIB_SLEEP@
 /* Pause the execution of the current thread for N seconds.
    Returns the number of seconds left to sleep.
diff --git a/gl/verify.h b/gl/verify.h
index 9a8caad..e9d6666 100644
--- a/gl/verify.h
+++ b/gl/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2012 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/gl/version-etc.c b/gl/version-etc.c
index b8d4724..ae1e44d 100644
--- a/gl/version-etc.c
+++ b/gl/version-etc.c
@@ -1,5 +1,5 @@
 /* Print --version and bug-reporting information in a consistent format.
-   Copyright (C) 1999-2011 Free Software Foundation, Inc.
+   Copyright (C) 1999-2012 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
@@ -38,7 +38,7 @@
 # define PACKAGE PACKAGE_TARNAME
 #endif
 
-enum { COPYRIGHT_YEAR = 2011 };
+enum { COPYRIGHT_YEAR = 2012 };
 
 /* The three functions below display the --version information the
    standard way.
diff --git a/gl/version-etc.h b/gl/version-etc.h
index a9b313d..4e47b6f 100644
--- a/gl/version-etc.h
+++ b/gl/version-etc.h
@@ -1,5 +1,5 @@
 /* Print --version and bug-reporting information in a consistent format.
-   Copyright (C) 1999, 2003, 2005, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003, 2005, 2009-2012 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/gltests/Makefile.am b/gltests/Makefile.am
index e65e9e9..9fa3022 100644
--- a/gltests/Makefile.am
+++ b/gltests/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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
@@ -997,6 +997,14 @@ EXTRA_DIST += sys_stat.in.h
 
 ## end   gnulib module sys_stat
 
+## begin gnulib module test-framework-sh-tests
+
+TESTS += test-init.sh
+EXTRA_DIST += init.sh
+EXTRA_DIST += test-init.sh
+
+## end   gnulib module test-framework-sh-tests
+
 ## begin gnulib module time
 
 BUILT_SOURCES += time.h
@@ -1061,7 +1069,7 @@ EXTRA_DIST += test-unsetenv.c signature.h macros.h
 TESTS += test-vc-list-files-git.sh
 TESTS += test-vc-list-files-cvs.sh
 TESTS_ENVIRONMENT += abs_aux_dir='$(abs_aux_dir)'
-EXTRA_DIST += test-vc-list-files-git.sh test-vc-list-files-cvs.sh init.sh
+EXTRA_DIST += test-vc-list-files-git.sh test-vc-list-files-cvs.sh
 
 ## end   gnulib module vc-list-files-tests
 
@@ -1070,7 +1078,7 @@ EXTRA_DIST += test-vc-list-files-git.sh test-vc-list-files-cvs.sh init.sh
 TESTS_ENVIRONMENT += MAKE='$(MAKE)'
 TESTS += test-verify test-verify.sh
 check_PROGRAMS += test-verify
-EXTRA_DIST += test-verify.c test-verify.sh init.sh
+EXTRA_DIST += test-verify.c test-verify.sh
 
 ## end   gnulib module verify-tests
 
diff --git a/gltests/alloca.in.h b/gltests/alloca.in.h
index 5b69c6c..ca9e7fe 100644
--- a/gltests/alloca.in.h
+++ b/gltests/alloca.in.h
@@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2011 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2012 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify it
diff --git a/gltests/binary-io.h b/gltests/binary-io.h
index c09dbf5..824ad5b 100644
--- a/gltests/binary-io.h
+++ b/gltests/binary-io.h
@@ -1,5 +1,5 @@
 /* Binary mode I/O.
-   Copyright (C) 2001, 2003, 2005, 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2003, 2005, 2008-2012 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/gltests/close.c b/gltests/close.c
index c2197fe..4b7accb 100644
--- a/gltests/close.c
+++ b/gltests/close.c
@@ -1,5 +1,5 @@
 /* close replacement.
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 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/gltests/dosname.h b/gltests/dosname.h
index acdd03b..0468ce4 100644
--- a/gltests/dosname.h
+++ b/gltests/dosname.h
@@ -1,6 +1,6 @@
 /* File names on MS-DOS/Windows systems.
 
-   Copyright (C) 2000-2001, 2004-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2000-2001, 2004-2006, 2009-2012 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/gltests/dup2.c b/gltests/dup2.c
index 790c98a..313b619 100644
--- a/gltests/dup2.c
+++ b/gltests/dup2.c
@@ -1,6 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
 
-   Copyright (C) 1999, 2004-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2012 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/gltests/fcntl.in.h b/gltests/fcntl.in.h
index 0a07221..ceaa9ba 100644
--- a/gltests/fcntl.in.h
+++ b/gltests/fcntl.in.h
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 2006-2012 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/gltests/fd-hook.c b/gltests/fd-hook.c
index b58300d..8f4ffe2 100644
--- a/gltests/fd-hook.c
+++ b/gltests/fd-hook.c
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/gltests/fd-hook.h b/gltests/fd-hook.h
index ada4c87..721e9ad 100644
--- a/gltests/fd-hook.h
+++ b/gltests/fd-hook.h
@@ -1,5 +1,5 @@
 /* Hook for making making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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
diff --git a/gltests/fdopen.c b/gltests/fdopen.c
index 50c889b..6595b16 100644
--- a/gltests/fdopen.c
+++ b/gltests/fdopen.c
@@ -1,5 +1,5 @@
 /* Open a stream with a given file descriptor.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/fstat.c b/gltests/fstat.c
index db5b17c..4918495 100644
--- a/gltests/fstat.c
+++ b/gltests/fstat.c
@@ -1,5 +1,5 @@
 /* fstat() replacement.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/getcwd-lgpl.c b/gltests/getcwd-lgpl.c
index 2761422..57f908a 100644
--- a/gltests/getcwd-lgpl.c
+++ b/gltests/getcwd-lgpl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
    This file is part of gnulib.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gltests/ignore-value.h b/gltests/ignore-value.h
index f021a1a..92f2fbc 100644
--- a/gltests/ignore-value.h
+++ b/gltests/ignore-value.h
@@ -1,6 +1,6 @@
 /* ignore a function return without a compiler warning
 
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 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/gltests/init.sh b/gltests/init.sh
index e2f6119..9485492 100644
--- a/gltests/init.sh
+++ b/gltests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 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
@@ -242,13 +242,13 @@ compare_dev_null_ ()
 
   if test "x$1" = x/dev/null; then
     test -s "$2" || return 0
-    { emit_diff_u_header_ "$@"; sed 's/^/+/' -- "$2"; } >&2
+    emit_diff_u_header_ "$@"; sed 's/^/+/' "$2"
     return 1
   fi
 
   if test "x$2" = x/dev/null; then
     test -s "$1" || return 0
-    { emit_diff_u_header_ "$@"; sed 's/^/-/' -- "$1"; } >&2
+    emit_diff_u_header_ "$@"; sed 's/^/-/' "$1"
     return 1
   fi
 
@@ -304,11 +304,17 @@ fi
 # Otherwise, propagate $? to caller: any diffs have already been printed.
 compare ()
 {
-  compare_dev_null_ "$@"
-  case $? in
-    0|1) return $?;;
-    *) compare_ "$@";;
-  esac
+  # This looks like it can be factored to use a simple "case $?"
+  # after unchecked compare_dev_null_ invocation, but that would
+  # fail in a "set -e" environment.
+  if compare_dev_null_ "$@"; then
+    return 0
+  else
+    case $? in
+      1) return 1;;
+      *) compare_ "$@";;
+    esac
+  fi
 }
 
 # An arbitrary prefix to help distinguish test directories.
@@ -521,7 +527,7 @@ mktempd_ ()
   esac
 
   # First, try to use mktemp.
-  d=`unset TMPDIR; mktemp -d -t -p "$destdir_" "$template_" 2>/dev/null` \
+  d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` \
     || fail=1
 
   # The resulting name must be in the specified directory.
diff --git a/gltests/inttypes.in.h b/gltests/inttypes.in.h
index 7abf394..e08a660 100644
--- a/gltests/inttypes.in.h
+++ b/gltests/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2011 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2012 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
@@ -31,6 +31,12 @@
    The include_next requires a split double-inclusion guard.  */
 #if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 # if @HAVE_INTTYPES_H@
+
+   /* Some pre-C++11 <stdint.h> implementations need this.  */
+#  if defined __cplusplus && ! defined __STDC_FORMAT_MACROS
+#   define __STDC_FORMAT_MACROS 1
+#  endif
+
 #  @INCLUDE_NEXT@ @NEXT_INTTYPES_H@
 # endif
 #endif
@@ -56,988 +62,984 @@
 
 /* 7.8.1 Macros for format specifiers */
 
-#if ! defined __cplusplus || defined __STDC_FORMAT_MACROS
-
-# if defined _TNS_R_TARGET
+#if defined _TNS_R_TARGET
    /* Tandem NonStop R series and compatible platforms released before
       July 2005 support %Ld but not %lld.  */
-#  define _LONG_LONG_FORMAT_PREFIX "L"
-# else
-#  define _LONG_LONG_FORMAT_PREFIX "ll"
-# endif
+# define _LONG_LONG_FORMAT_PREFIX "L"
+#else
+# define _LONG_LONG_FORMAT_PREFIX "ll"
+#endif
 
-# if !defined PRId8 || @PRI_MACROS_BROKEN@
-#  undef PRId8
-#  ifdef INT8_MAX
-#   define PRId8 "d"
-#  endif
+#if !defined PRId8 || @PRI_MACROS_BROKEN@
+# undef PRId8
+# ifdef INT8_MAX
+#  define PRId8 "d"
 # endif
-# if !defined PRIi8 || @PRI_MACROS_BROKEN@
-#  undef PRIi8
-#  ifdef INT8_MAX
-#   define PRIi8 "i"
-#  endif
+#endif
+#if !defined PRIi8 || @PRI_MACROS_BROKEN@
+# undef PRIi8
+# ifdef INT8_MAX
+#  define PRIi8 "i"
 # endif
-# if !defined PRIo8 || @PRI_MACROS_BROKEN@
-#  undef PRIo8
-#  ifdef UINT8_MAX
-#   define PRIo8 "o"
-#  endif
+#endif
+#if !defined PRIo8 || @PRI_MACROS_BROKEN@
+# undef PRIo8
+# ifdef UINT8_MAX
+#  define PRIo8 "o"
 # endif
-# if !defined PRIu8 || @PRI_MACROS_BROKEN@
-#  undef PRIu8
-#  ifdef UINT8_MAX
-#   define PRIu8 "u"
-#  endif
+#endif
+#if !defined PRIu8 || @PRI_MACROS_BROKEN@
+# undef PRIu8
+# ifdef UINT8_MAX
+#  define PRIu8 "u"
 # endif
-# if !defined PRIx8 || @PRI_MACROS_BROKEN@
-#  undef PRIx8
-#  ifdef UINT8_MAX
-#   define PRIx8 "x"
-#  endif
+#endif
+#if !defined PRIx8 || @PRI_MACROS_BROKEN@
+# undef PRIx8
+# ifdef UINT8_MAX
+#  define PRIx8 "x"
 # endif
-# if !defined PRIX8 || @PRI_MACROS_BROKEN@
-#  undef PRIX8
-#  ifdef UINT8_MAX
-#   define PRIX8 "X"
-#  endif
+#endif
+#if !defined PRIX8 || @PRI_MACROS_BROKEN@
+# undef PRIX8
+# ifdef UINT8_MAX
+#  define PRIX8 "X"
 # endif
-# if !defined PRId16 || @PRI_MACROS_BROKEN@
-#  undef PRId16
-#  ifdef INT16_MAX
-#   define PRId16 "d"
-#  endif
+#endif
+#if !defined PRId16 || @PRI_MACROS_BROKEN@
+# undef PRId16
+# ifdef INT16_MAX
+#  define PRId16 "d"
 # endif
-# if !defined PRIi16 || @PRI_MACROS_BROKEN@
-#  undef PRIi16
-#  ifdef INT16_MAX
-#   define PRIi16 "i"
-#  endif
+#endif
+#if !defined PRIi16 || @PRI_MACROS_BROKEN@
+# undef PRIi16
+# ifdef INT16_MAX
+#  define PRIi16 "i"
 # endif
-# if !defined PRIo16 || @PRI_MACROS_BROKEN@
-#  undef PRIo16
-#  ifdef UINT16_MAX
-#   define PRIo16 "o"
-#  endif
+#endif
+#if !defined PRIo16 || @PRI_MACROS_BROKEN@
+# undef PRIo16
+# ifdef UINT16_MAX
+#  define PRIo16 "o"
 # endif
-# if !defined PRIu16 || @PRI_MACROS_BROKEN@
-#  undef PRIu16
-#  ifdef UINT16_MAX
-#   define PRIu16 "u"
-#  endif
+#endif
+#if !defined PRIu16 || @PRI_MACROS_BROKEN@
+# undef PRIu16
+# ifdef UINT16_MAX
+#  define PRIu16 "u"
 # endif
-# if !defined PRIx16 || @PRI_MACROS_BROKEN@
-#  undef PRIx16
-#  ifdef UINT16_MAX
-#   define PRIx16 "x"
-#  endif
+#endif
+#if !defined PRIx16 || @PRI_MACROS_BROKEN@
+# undef PRIx16
+# ifdef UINT16_MAX
+#  define PRIx16 "x"
 # endif
-# if !defined PRIX16 || @PRI_MACROS_BROKEN@
-#  undef PRIX16
-#  ifdef UINT16_MAX
-#   define PRIX16 "X"
-#  endif
+#endif
+#if !defined PRIX16 || @PRI_MACROS_BROKEN@
+# undef PRIX16
+# ifdef UINT16_MAX
+#  define PRIX16 "X"
 # endif
-# if !defined PRId32 || @PRI_MACROS_BROKEN@
-#  undef PRId32
-#  ifdef INT32_MAX
-#   define PRId32 "d"
-#  endif
+#endif
+#if !defined PRId32 || @PRI_MACROS_BROKEN@
+# undef PRId32
+# ifdef INT32_MAX
+#  define PRId32 "d"
 # endif
-# if !defined PRIi32 || @PRI_MACROS_BROKEN@
-#  undef PRIi32
-#  ifdef INT32_MAX
-#   define PRIi32 "i"
-#  endif
+#endif
+#if !defined PRIi32 || @PRI_MACROS_BROKEN@
+# undef PRIi32
+# ifdef INT32_MAX
+#  define PRIi32 "i"
 # endif
-# if !defined PRIo32 || @PRI_MACROS_BROKEN@
-#  undef PRIo32
-#  ifdef UINT32_MAX
-#   define PRIo32 "o"
-#  endif
+#endif
+#if !defined PRIo32 || @PRI_MACROS_BROKEN@
+# undef PRIo32
+# ifdef UINT32_MAX
+#  define PRIo32 "o"
 # endif
-# if !defined PRIu32 || @PRI_MACROS_BROKEN@
-#  undef PRIu32
-#  ifdef UINT32_MAX
-#   define PRIu32 "u"
-#  endif
+#endif
+#if !defined PRIu32 || @PRI_MACROS_BROKEN@
+# undef PRIu32
+# ifdef UINT32_MAX
+#  define PRIu32 "u"
 # endif
-# if !defined PRIx32 || @PRI_MACROS_BROKEN@
-#  undef PRIx32
-#  ifdef UINT32_MAX
-#   define PRIx32 "x"
-#  endif
+#endif
+#if !defined PRIx32 || @PRI_MACROS_BROKEN@
+# undef PRIx32
+# ifdef UINT32_MAX
+#  define PRIx32 "x"
 # endif
-# if !defined PRIX32 || @PRI_MACROS_BROKEN@
-#  undef PRIX32
-#  ifdef UINT32_MAX
-#   define PRIX32 "X"
-#  endif
+#endif
+#if !defined PRIX32 || @PRI_MACROS_BROKEN@
+# undef PRIX32
+# ifdef UINT32_MAX
+#  define PRIX32 "X"
 # endif
-# ifdef INT64_MAX
-#  if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
-#   define _PRI64_PREFIX "l"
-#  elif defined _MSC_VER || defined __MINGW32__
-#   define _PRI64_PREFIX "I64"
-#  elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#   define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX
-#  endif
-#  if !defined PRId64 || @PRI_MACROS_BROKEN@
-#   undef PRId64
-#   define PRId64 _PRI64_PREFIX "d"
-#  endif
-#  if !defined PRIi64 || @PRI_MACROS_BROKEN@
-#   undef PRIi64
-#   define PRIi64 _PRI64_PREFIX "i"
-#  endif
+#endif
+#ifdef INT64_MAX
+# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
+#  define _PRI64_PREFIX "l"
+# elif defined _MSC_VER || defined __MINGW32__
+#  define _PRI64_PREFIX "I64"
+# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#  define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX
+# endif
+# if !defined PRId64 || @PRI_MACROS_BROKEN@
+#  undef PRId64
+#  define PRId64 _PRI64_PREFIX "d"
+# endif
+# if !defined PRIi64 || @PRI_MACROS_BROKEN@
+#  undef PRIi64
+#  define PRIi64 _PRI64_PREFIX "i"
 # endif
-# ifdef UINT64_MAX
-#  if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
-#   define _PRIu64_PREFIX "l"
-#  elif defined _MSC_VER || defined __MINGW32__
-#   define _PRIu64_PREFIX "I64"
-#  elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#   define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX
-#  endif
-#  if !defined PRIo64 || @PRI_MACROS_BROKEN@
-#   undef PRIo64
-#   define PRIo64 _PRIu64_PREFIX "o"
-#  endif
-#  if !defined PRIu64 || @PRI_MACROS_BROKEN@
-#   undef PRIu64
-#   define PRIu64 _PRIu64_PREFIX "u"
-#  endif
-#  if !defined PRIx64 || @PRI_MACROS_BROKEN@
-#   undef PRIx64
-#   define PRIx64 _PRIu64_PREFIX "x"
-#  endif
-#  if !defined PRIX64 || @PRI_MACROS_BROKEN@
-#   undef PRIX64
-#   define PRIX64 _PRIu64_PREFIX "X"
-#  endif
+#endif
+#ifdef UINT64_MAX
+# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
+#  define _PRIu64_PREFIX "l"
+# elif defined _MSC_VER || defined __MINGW32__
+#  define _PRIu64_PREFIX "I64"
+# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#  define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX
+# endif
+# if !defined PRIo64 || @PRI_MACROS_BROKEN@
+#  undef PRIo64
+#  define PRIo64 _PRIu64_PREFIX "o"
+# endif
+# if !defined PRIu64 || @PRI_MACROS_BROKEN@
+#  undef PRIu64
+#  define PRIu64 _PRIu64_PREFIX "u"
+# endif
+# if !defined PRIx64 || @PRI_MACROS_BROKEN@
+#  undef PRIx64
+#  define PRIx64 _PRIu64_PREFIX "x"
+# endif
+# if !defined PRIX64 || @PRI_MACROS_BROKEN@
+#  undef PRIX64
+#  define PRIX64 _PRIu64_PREFIX "X"
 # endif
+#endif
 
-# if !defined PRIdLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIdLEAST8
-#  define PRIdLEAST8 "d"
-# endif
-# if !defined PRIiLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIiLEAST8
-#  define PRIiLEAST8 "i"
-# endif
-# if !defined PRIoLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIoLEAST8
-#  define PRIoLEAST8 "o"
-# endif
-# if !defined PRIuLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIuLEAST8
-#  define PRIuLEAST8 "u"
-# endif
-# if !defined PRIxLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIxLEAST8
-#  define PRIxLEAST8 "x"
-# endif
-# if !defined PRIXLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIXLEAST8
-#  define PRIXLEAST8 "X"
-# endif
-# if !defined PRIdLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIdLEAST16
-#  define PRIdLEAST16 "d"
-# endif
-# if !defined PRIiLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIiLEAST16
-#  define PRIiLEAST16 "i"
-# endif
-# if !defined PRIoLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIoLEAST16
-#  define PRIoLEAST16 "o"
-# endif
-# if !defined PRIuLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIuLEAST16
-#  define PRIuLEAST16 "u"
-# endif
-# if !defined PRIxLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIxLEAST16
-#  define PRIxLEAST16 "x"
-# endif
-# if !defined PRIXLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIXLEAST16
-#  define PRIXLEAST16 "X"
-# endif
-# if !defined PRIdLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIdLEAST32
-#  define PRIdLEAST32 "d"
-# endif
-# if !defined PRIiLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIiLEAST32
-#  define PRIiLEAST32 "i"
-# endif
-# if !defined PRIoLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIoLEAST32
-#  define PRIoLEAST32 "o"
-# endif
-# if !defined PRIuLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIuLEAST32
-#  define PRIuLEAST32 "u"
-# endif
-# if !defined PRIxLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIxLEAST32
-#  define PRIxLEAST32 "x"
-# endif
-# if !defined PRIXLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIXLEAST32
-#  define PRIXLEAST32 "X"
-# endif
-# ifdef INT64_MAX
-#  if !defined PRIdLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIdLEAST64
-#   define PRIdLEAST64 PRId64
-#  endif
-#  if !defined PRIiLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIiLEAST64
-#   define PRIiLEAST64 PRIi64
-#  endif
+#if !defined PRIdLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIdLEAST8
+# define PRIdLEAST8 "d"
+#endif
+#if !defined PRIiLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIiLEAST8
+# define PRIiLEAST8 "i"
+#endif
+#if !defined PRIoLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIoLEAST8
+# define PRIoLEAST8 "o"
+#endif
+#if !defined PRIuLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIuLEAST8
+# define PRIuLEAST8 "u"
+#endif
+#if !defined PRIxLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIxLEAST8
+# define PRIxLEAST8 "x"
+#endif
+#if !defined PRIXLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIXLEAST8
+# define PRIXLEAST8 "X"
+#endif
+#if !defined PRIdLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIdLEAST16
+# define PRIdLEAST16 "d"
+#endif
+#if !defined PRIiLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIiLEAST16
+# define PRIiLEAST16 "i"
+#endif
+#if !defined PRIoLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIoLEAST16
+# define PRIoLEAST16 "o"
+#endif
+#if !defined PRIuLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIuLEAST16
+# define PRIuLEAST16 "u"
+#endif
+#if !defined PRIxLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIxLEAST16
+# define PRIxLEAST16 "x"
+#endif
+#if !defined PRIXLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIXLEAST16
+# define PRIXLEAST16 "X"
+#endif
+#if !defined PRIdLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIdLEAST32
+# define PRIdLEAST32 "d"
+#endif
+#if !defined PRIiLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIiLEAST32
+# define PRIiLEAST32 "i"
+#endif
+#if !defined PRIoLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIoLEAST32
+# define PRIoLEAST32 "o"
+#endif
+#if !defined PRIuLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIuLEAST32
+# define PRIuLEAST32 "u"
+#endif
+#if !defined PRIxLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIxLEAST32
+# define PRIxLEAST32 "x"
+#endif
+#if !defined PRIXLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIXLEAST32
+# define PRIXLEAST32 "X"
+#endif
+#ifdef INT64_MAX
+# if !defined PRIdLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIdLEAST64
+#  define PRIdLEAST64 PRId64
 # endif
-# ifdef UINT64_MAX
-#  if !defined PRIoLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIoLEAST64
-#   define PRIoLEAST64 PRIo64
-#  endif
-#  if !defined PRIuLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIuLEAST64
-#   define PRIuLEAST64 PRIu64
-#  endif
-#  if !defined PRIxLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIxLEAST64
-#   define PRIxLEAST64 PRIx64
-#  endif
-#  if !defined PRIXLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIXLEAST64
-#   define PRIXLEAST64 PRIX64
-#  endif
+# if !defined PRIiLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIiLEAST64
+#  define PRIiLEAST64 PRIi64
+# endif
+#endif
+#ifdef UINT64_MAX
+# if !defined PRIoLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIoLEAST64
+#  define PRIoLEAST64 PRIo64
+# endif
+# if !defined PRIuLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIuLEAST64
+#  define PRIuLEAST64 PRIu64
+# endif
+# if !defined PRIxLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIxLEAST64
+#  define PRIxLEAST64 PRIx64
 # endif
+# if !defined PRIXLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIXLEAST64
+#  define PRIXLEAST64 PRIX64
+# endif
+#endif
 
-# if !defined PRIdFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIdFAST8
-#  if INT_FAST8_MAX > INT32_MAX
-#   define PRIdFAST8 PRId64
-#  else
-#   define PRIdFAST8 "d"
-#  endif
+#if !defined PRIdFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIdFAST8
+# if INT_FAST8_MAX > INT32_MAX
+#  define PRIdFAST8 PRId64
+# else
+#  define PRIdFAST8 "d"
 # endif
-# if !defined PRIiFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIiFAST8
-#  if INT_FAST8_MAX > INT32_MAX
-#   define PRIiFAST8 PRIi64
-#  else
-#   define PRIiFAST8 "i"
-#  endif
+#endif
+#if !defined PRIiFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIiFAST8
+# if INT_FAST8_MAX > INT32_MAX
+#  define PRIiFAST8 PRIi64
+# else
+#  define PRIiFAST8 "i"
 # endif
-# if !defined PRIoFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIoFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define PRIoFAST8 PRIo64
-#  else
-#   define PRIoFAST8 "o"
-#  endif
+#endif
+#if !defined PRIoFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIoFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define PRIoFAST8 PRIo64
+# else
+#  define PRIoFAST8 "o"
 # endif
-# if !defined PRIuFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIuFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define PRIuFAST8 PRIu64
-#  else
-#   define PRIuFAST8 "u"
-#  endif
+#endif
+#if !defined PRIuFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIuFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define PRIuFAST8 PRIu64
+# else
+#  define PRIuFAST8 "u"
 # endif
-# if !defined PRIxFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIxFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define PRIxFAST8 PRIx64
-#  else
-#   define PRIxFAST8 "x"
-#  endif
+#endif
+#if !defined PRIxFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIxFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define PRIxFAST8 PRIx64
+# else
+#  define PRIxFAST8 "x"
 # endif
-# if !defined PRIXFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIXFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define PRIXFAST8 PRIX64
-#  else
-#   define PRIXFAST8 "X"
-#  endif
+#endif
+#if !defined PRIXFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIXFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define PRIXFAST8 PRIX64
+# else
+#  define PRIXFAST8 "X"
 # endif
-# if !defined PRIdFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIdFAST16
-#  if INT_FAST16_MAX > INT32_MAX
-#   define PRIdFAST16 PRId64
-#  else
-#   define PRIdFAST16 "d"
-#  endif
+#endif
+#if !defined PRIdFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIdFAST16
+# if INT_FAST16_MAX > INT32_MAX
+#  define PRIdFAST16 PRId64
+# else
+#  define PRIdFAST16 "d"
 # endif
-# if !defined PRIiFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIiFAST16
-#  if INT_FAST16_MAX > INT32_MAX
-#   define PRIiFAST16 PRIi64
-#  else
-#   define PRIiFAST16 "i"
-#  endif
+#endif
+#if !defined PRIiFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIiFAST16
+# if INT_FAST16_MAX > INT32_MAX
+#  define PRIiFAST16 PRIi64
+# else
+#  define PRIiFAST16 "i"
 # endif
-# if !defined PRIoFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIoFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define PRIoFAST16 PRIo64
-#  else
-#   define PRIoFAST16 "o"
-#  endif
+#endif
+#if !defined PRIoFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIoFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define PRIoFAST16 PRIo64
+# else
+#  define PRIoFAST16 "o"
 # endif
-# if !defined PRIuFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIuFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define PRIuFAST16 PRIu64
-#  else
-#   define PRIuFAST16 "u"
-#  endif
+#endif
+#if !defined PRIuFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIuFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define PRIuFAST16 PRIu64
+# else
+#  define PRIuFAST16 "u"
 # endif
-# if !defined PRIxFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIxFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define PRIxFAST16 PRIx64
-#  else
-#   define PRIxFAST16 "x"
-#  endif
+#endif
+#if !defined PRIxFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIxFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define PRIxFAST16 PRIx64
+# else
+#  define PRIxFAST16 "x"
 # endif
-# if !defined PRIXFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIXFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define PRIXFAST16 PRIX64
-#  else
-#   define PRIXFAST16 "X"
-#  endif
+#endif
+#if !defined PRIXFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIXFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define PRIXFAST16 PRIX64
+# else
+#  define PRIXFAST16 "X"
 # endif
-# if !defined PRIdFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIdFAST32
-#  if INT_FAST32_MAX > INT32_MAX
-#   define PRIdFAST32 PRId64
-#  else
-#   define PRIdFAST32 "d"
-#  endif
+#endif
+#if !defined PRIdFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIdFAST32
+# if INT_FAST32_MAX > INT32_MAX
+#  define PRIdFAST32 PRId64
+# else
+#  define PRIdFAST32 "d"
 # endif
-# if !defined PRIiFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIiFAST32
-#  if INT_FAST32_MAX > INT32_MAX
-#   define PRIiFAST32 PRIi64
-#  else
-#   define PRIiFAST32 "i"
-#  endif
+#endif
+#if !defined PRIiFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIiFAST32
+# if INT_FAST32_MAX > INT32_MAX
+#  define PRIiFAST32 PRIi64
+# else
+#  define PRIiFAST32 "i"
 # endif
-# if !defined PRIoFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIoFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define PRIoFAST32 PRIo64
-#  else
-#   define PRIoFAST32 "o"
-#  endif
+#endif
+#if !defined PRIoFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIoFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define PRIoFAST32 PRIo64
+# else
+#  define PRIoFAST32 "o"
 # endif
-# if !defined PRIuFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIuFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define PRIuFAST32 PRIu64
-#  else
-#   define PRIuFAST32 "u"
-#  endif
+#endif
+#if !defined PRIuFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIuFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define PRIuFAST32 PRIu64
+# else
+#  define PRIuFAST32 "u"
 # endif
-# if !defined PRIxFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIxFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define PRIxFAST32 PRIx64
-#  else
-#   define PRIxFAST32 "x"
-#  endif
+#endif
+#if !defined PRIxFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIxFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define PRIxFAST32 PRIx64
+# else
+#  define PRIxFAST32 "x"
 # endif
-# if !defined PRIXFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIXFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define PRIXFAST32 PRIX64
-#  else
-#   define PRIXFAST32 "X"
-#  endif
+#endif
+#if !defined PRIXFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIXFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define PRIXFAST32 PRIX64
+# else
+#  define PRIXFAST32 "X"
 # endif
-# ifdef INT64_MAX
-#  if !defined PRIdFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIdFAST64
-#   define PRIdFAST64 PRId64
-#  endif
-#  if !defined PRIiFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIiFAST64
-#   define PRIiFAST64 PRIi64
-#  endif
+#endif
+#ifdef INT64_MAX
+# if !defined PRIdFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIdFAST64
+#  define PRIdFAST64 PRId64
 # endif
-# ifdef UINT64_MAX
-#  if !defined PRIoFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIoFAST64
-#   define PRIoFAST64 PRIo64
-#  endif
-#  if !defined PRIuFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIuFAST64
-#   define PRIuFAST64 PRIu64
-#  endif
-#  if !defined PRIxFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIxFAST64
-#   define PRIxFAST64 PRIx64
-#  endif
-#  if !defined PRIXFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIXFAST64
-#   define PRIXFAST64 PRIX64
-#  endif
+# if !defined PRIiFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIiFAST64
+#  define PRIiFAST64 PRIi64
+# endif
+#endif
+#ifdef UINT64_MAX
+# if !defined PRIoFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIoFAST64
+#  define PRIoFAST64 PRIo64
+# endif
+# if !defined PRIuFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIuFAST64
+#  define PRIuFAST64 PRIu64
+# endif
+# if !defined PRIxFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIxFAST64
+#  define PRIxFAST64 PRIx64
 # endif
+# if !defined PRIXFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIXFAST64
+#  define PRIXFAST64 PRIX64
+# endif
+#endif
 
-# if !defined PRIdMAX || @PRI_MACROS_BROKEN@
-#  undef PRIdMAX
-#  if @INT32_MAX_LT_INTMAX_MAX@
-#   define PRIdMAX PRId64
-#  else
-#   define PRIdMAX "ld"
-#  endif
+#if !defined PRIdMAX || @PRI_MACROS_BROKEN@
+# undef PRIdMAX
+# if @INT32_MAX_LT_INTMAX_MAX@
+#  define PRIdMAX PRId64
+# else
+#  define PRIdMAX "ld"
 # endif
-# if !defined PRIiMAX || @PRI_MACROS_BROKEN@
-#  undef PRIiMAX
-#  if @INT32_MAX_LT_INTMAX_MAX@
-#   define PRIiMAX PRIi64
-#  else
-#   define PRIiMAX "li"
-#  endif
+#endif
+#if !defined PRIiMAX || @PRI_MACROS_BROKEN@
+# undef PRIiMAX
+# if @INT32_MAX_LT_INTMAX_MAX@
+#  define PRIiMAX PRIi64
+# else
+#  define PRIiMAX "li"
 # endif
-# if !defined PRIoMAX || @PRI_MACROS_BROKEN@
-#  undef PRIoMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define PRIoMAX PRIo64
-#  else
-#   define PRIoMAX "lo"
-#  endif
+#endif
+#if !defined PRIoMAX || @PRI_MACROS_BROKEN@
+# undef PRIoMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define PRIoMAX PRIo64
+# else
+#  define PRIoMAX "lo"
 # endif
-# if !defined PRIuMAX || @PRI_MACROS_BROKEN@
-#  undef PRIuMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define PRIuMAX PRIu64
-#  else
-#   define PRIuMAX "lu"
-#  endif
+#endif
+#if !defined PRIuMAX || @PRI_MACROS_BROKEN@
+# undef PRIuMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define PRIuMAX PRIu64
+# else
+#  define PRIuMAX "lu"
 # endif
-# if !defined PRIxMAX || @PRI_MACROS_BROKEN@
-#  undef PRIxMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define PRIxMAX PRIx64
-#  else
-#   define PRIxMAX "lx"
-#  endif
+#endif
+#if !defined PRIxMAX || @PRI_MACROS_BROKEN@
+# undef PRIxMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define PRIxMAX PRIx64
+# else
+#  define PRIxMAX "lx"
 # endif
-# if !defined PRIXMAX || @PRI_MACROS_BROKEN@
-#  undef PRIXMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define PRIXMAX PRIX64
-#  else
-#   define PRIXMAX "lX"
-#  endif
+#endif
+#if !defined PRIXMAX || @PRI_MACROS_BROKEN@
+# undef PRIXMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define PRIXMAX PRIX64
+# else
+#  define PRIXMAX "lX"
 # endif
+#endif
 
-# if !defined PRIdPTR || @PRI_MACROS_BROKEN@
-#  undef PRIdPTR
-#  ifdef INTPTR_MAX
-#   define PRIdPTR @PRIPTR_PREFIX@ "d"
-#  endif
+#if !defined PRIdPTR || @PRI_MACROS_BROKEN@
+# undef PRIdPTR
+# ifdef INTPTR_MAX
+#  define PRIdPTR @PRIPTR_PREFIX@ "d"
 # endif
-# if !defined PRIiPTR || @PRI_MACROS_BROKEN@
-#  undef PRIiPTR
-#  ifdef INTPTR_MAX
-#   define PRIiPTR @PRIPTR_PREFIX@ "i"
-#  endif
+#endif
+#if !defined PRIiPTR || @PRI_MACROS_BROKEN@
+# undef PRIiPTR
+# ifdef INTPTR_MAX
+#  define PRIiPTR @PRIPTR_PREFIX@ "i"
 # endif
-# if !defined PRIoPTR || @PRI_MACROS_BROKEN@
-#  undef PRIoPTR
-#  ifdef UINTPTR_MAX
-#   define PRIoPTR @PRIPTR_PREFIX@ "o"
-#  endif
+#endif
+#if !defined PRIoPTR || @PRI_MACROS_BROKEN@
+# undef PRIoPTR
+# ifdef UINTPTR_MAX
+#  define PRIoPTR @PRIPTR_PREFIX@ "o"
 # endif
-# if !defined PRIuPTR || @PRI_MACROS_BROKEN@
-#  undef PRIuPTR
-#  ifdef UINTPTR_MAX
-#   define PRIuPTR @PRIPTR_PREFIX@ "u"
-#  endif
+#endif
+#if !defined PRIuPTR || @PRI_MACROS_BROKEN@
+# undef PRIuPTR
+# ifdef UINTPTR_MAX
+#  define PRIuPTR @PRIPTR_PREFIX@ "u"
 # endif
-# if !defined PRIxPTR || @PRI_MACROS_BROKEN@
-#  undef PRIxPTR
-#  ifdef UINTPTR_MAX
-#   define PRIxPTR @PRIPTR_PREFIX@ "x"
-#  endif
+#endif
+#if !defined PRIxPTR || @PRI_MACROS_BROKEN@
+# undef PRIxPTR
+# ifdef UINTPTR_MAX
+#  define PRIxPTR @PRIPTR_PREFIX@ "x"
 # endif
-# if !defined PRIXPTR || @PRI_MACROS_BROKEN@
-#  undef PRIXPTR
-#  ifdef UINTPTR_MAX
-#   define PRIXPTR @PRIPTR_PREFIX@ "X"
-#  endif
+#endif
+#if !defined PRIXPTR || @PRI_MACROS_BROKEN@
+# undef PRIXPTR
+# ifdef UINTPTR_MAX
+#  define PRIXPTR @PRIPTR_PREFIX@ "X"
 # endif
+#endif
 
-# if !defined SCNd8 || @PRI_MACROS_BROKEN@
-#  undef SCNd8
-#  ifdef INT8_MAX
-#   define SCNd8 "hhd"
-#  endif
+#if !defined SCNd8 || @PRI_MACROS_BROKEN@
+# undef SCNd8
+# ifdef INT8_MAX
+#  define SCNd8 "hhd"
 # endif
-# if !defined SCNi8 || @PRI_MACROS_BROKEN@
-#  undef SCNi8
-#  ifdef INT8_MAX
-#   define SCNi8 "hhi"
-#  endif
+#endif
+#if !defined SCNi8 || @PRI_MACROS_BROKEN@
+# undef SCNi8
+# ifdef INT8_MAX
+#  define SCNi8 "hhi"
 # endif
-# if !defined SCNo8 || @PRI_MACROS_BROKEN@
-#  undef SCNo8
-#  ifdef UINT8_MAX
-#   define SCNo8 "hho"
-#  endif
+#endif
+#if !defined SCNo8 || @PRI_MACROS_BROKEN@
+# undef SCNo8
+# ifdef UINT8_MAX
+#  define SCNo8 "hho"
 # endif
-# if !defined SCNu8 || @PRI_MACROS_BROKEN@
-#  undef SCNu8
-#  ifdef UINT8_MAX
-#   define SCNu8 "hhu"
-#  endif
+#endif
+#if !defined SCNu8 || @PRI_MACROS_BROKEN@
+# undef SCNu8
+# ifdef UINT8_MAX
+#  define SCNu8 "hhu"
 # endif
-# if !defined SCNx8 || @PRI_MACROS_BROKEN@
-#  undef SCNx8
-#  ifdef UINT8_MAX
-#   define SCNx8 "hhx"
-#  endif
+#endif
+#if !defined SCNx8 || @PRI_MACROS_BROKEN@
+# undef SCNx8
+# ifdef UINT8_MAX
+#  define SCNx8 "hhx"
 # endif
-# if !defined SCNd16 || @PRI_MACROS_BROKEN@
-#  undef SCNd16
-#  ifdef INT16_MAX
-#   define SCNd16 "hd"
-#  endif
+#endif
+#if !defined SCNd16 || @PRI_MACROS_BROKEN@
+# undef SCNd16
+# ifdef INT16_MAX
+#  define SCNd16 "hd"
 # endif
-# if !defined SCNi16 || @PRI_MACROS_BROKEN@
-#  undef SCNi16
-#  ifdef INT16_MAX
-#   define SCNi16 "hi"
-#  endif
+#endif
+#if !defined SCNi16 || @PRI_MACROS_BROKEN@
+# undef SCNi16
+# ifdef INT16_MAX
+#  define SCNi16 "hi"
 # endif
-# if !defined SCNo16 || @PRI_MACROS_BROKEN@
-#  undef SCNo16
-#  ifdef UINT16_MAX
-#   define SCNo16 "ho"
-#  endif
+#endif
+#if !defined SCNo16 || @PRI_MACROS_BROKEN@
+# undef SCNo16
+# ifdef UINT16_MAX
+#  define SCNo16 "ho"
 # endif
-# if !defined SCNu16 || @PRI_MACROS_BROKEN@
-#  undef SCNu16
-#  ifdef UINT16_MAX
-#   define SCNu16 "hu"
-#  endif
+#endif
+#if !defined SCNu16 || @PRI_MACROS_BROKEN@
+# undef SCNu16
+# ifdef UINT16_MAX
+#  define SCNu16 "hu"
 # endif
-# if !defined SCNx16 || @PRI_MACROS_BROKEN@
-#  undef SCNx16
-#  ifdef UINT16_MAX
-#   define SCNx16 "hx"
-#  endif
+#endif
+#if !defined SCNx16 || @PRI_MACROS_BROKEN@
+# undef SCNx16
+# ifdef UINT16_MAX
+#  define SCNx16 "hx"
 # endif
-# if !defined SCNd32 || @PRI_MACROS_BROKEN@
-#  undef SCNd32
-#  ifdef INT32_MAX
-#   define SCNd32 "d"
-#  endif
+#endif
+#if !defined SCNd32 || @PRI_MACROS_BROKEN@
+# undef SCNd32
+# ifdef INT32_MAX
+#  define SCNd32 "d"
 # endif
-# if !defined SCNi32 || @PRI_MACROS_BROKEN@
-#  undef SCNi32
-#  ifdef INT32_MAX
-#   define SCNi32 "i"
-#  endif
+#endif
+#if !defined SCNi32 || @PRI_MACROS_BROKEN@
+# undef SCNi32
+# ifdef INT32_MAX
+#  define SCNi32 "i"
 # endif
-# if !defined SCNo32 || @PRI_MACROS_BROKEN@
-#  undef SCNo32
-#  ifdef UINT32_MAX
-#   define SCNo32 "o"
-#  endif
+#endif
+#if !defined SCNo32 || @PRI_MACROS_BROKEN@
+# undef SCNo32
+# ifdef UINT32_MAX
+#  define SCNo32 "o"
 # endif
-# if !defined SCNu32 || @PRI_MACROS_BROKEN@
-#  undef SCNu32
-#  ifdef UINT32_MAX
-#   define SCNu32 "u"
-#  endif
+#endif
+#if !defined SCNu32 || @PRI_MACROS_BROKEN@
+# undef SCNu32
+# ifdef UINT32_MAX
+#  define SCNu32 "u"
 # endif
-# if !defined SCNx32 || @PRI_MACROS_BROKEN@
-#  undef SCNx32
-#  ifdef UINT32_MAX
-#   define SCNx32 "x"
-#  endif
+#endif
+#if !defined SCNx32 || @PRI_MACROS_BROKEN@
+# undef SCNx32
+# ifdef UINT32_MAX
+#  define SCNx32 "x"
 # endif
-# ifdef INT64_MAX
-#  if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
-#   define _SCN64_PREFIX "l"
-#  elif defined _MSC_VER || defined __MINGW32__
-#   define _SCN64_PREFIX "I64"
-#  elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#   define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX
-#  endif
-#  if !defined SCNd64 || @PRI_MACROS_BROKEN@
-#   undef SCNd64
-#   define SCNd64 _SCN64_PREFIX "d"
-#  endif
-#  if !defined SCNi64 || @PRI_MACROS_BROKEN@
-#   undef SCNi64
-#   define SCNi64 _SCN64_PREFIX "i"
-#  endif
+#endif
+#ifdef INT64_MAX
+# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
+#  define _SCN64_PREFIX "l"
+# elif defined _MSC_VER || defined __MINGW32__
+#  define _SCN64_PREFIX "I64"
+# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#  define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX
+# endif
+# if !defined SCNd64 || @PRI_MACROS_BROKEN@
+#  undef SCNd64
+#  define SCNd64 _SCN64_PREFIX "d"
+# endif
+# if !defined SCNi64 || @PRI_MACROS_BROKEN@
+#  undef SCNi64
+#  define SCNi64 _SCN64_PREFIX "i"
 # endif
-# ifdef UINT64_MAX
-#  if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
-#   define _SCNu64_PREFIX "l"
-#  elif defined _MSC_VER || defined __MINGW32__
-#   define _SCNu64_PREFIX "I64"
-#  elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#   define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX
-#  endif
-#  if !defined SCNo64 || @PRI_MACROS_BROKEN@
-#   undef SCNo64
-#   define SCNo64 _SCNu64_PREFIX "o"
-#  endif
-#  if !defined SCNu64 || @PRI_MACROS_BROKEN@
-#   undef SCNu64
-#   define SCNu64 _SCNu64_PREFIX "u"
-#  endif
-#  if !defined SCNx64 || @PRI_MACROS_BROKEN@
-#   undef SCNx64
-#   define SCNx64 _SCNu64_PREFIX "x"
-#  endif
+#endif
+#ifdef UINT64_MAX
+# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
+#  define _SCNu64_PREFIX "l"
+# elif defined _MSC_VER || defined __MINGW32__
+#  define _SCNu64_PREFIX "I64"
+# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#  define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX
+# endif
+# if !defined SCNo64 || @PRI_MACROS_BROKEN@
+#  undef SCNo64
+#  define SCNo64 _SCNu64_PREFIX "o"
+# endif
+# if !defined SCNu64 || @PRI_MACROS_BROKEN@
+#  undef SCNu64
+#  define SCNu64 _SCNu64_PREFIX "u"
+# endif
+# if !defined SCNx64 || @PRI_MACROS_BROKEN@
+#  undef SCNx64
+#  define SCNx64 _SCNu64_PREFIX "x"
 # endif
+#endif
 
-# if !defined SCNdLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNdLEAST8
-#  define SCNdLEAST8 "hhd"
-# endif
-# if !defined SCNiLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNiLEAST8
-#  define SCNiLEAST8 "hhi"
-# endif
-# if !defined SCNoLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNoLEAST8
-#  define SCNoLEAST8 "hho"
-# endif
-# if !defined SCNuLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNuLEAST8
-#  define SCNuLEAST8 "hhu"
-# endif
-# if !defined SCNxLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNxLEAST8
-#  define SCNxLEAST8 "hhx"
-# endif
-# if !defined SCNdLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNdLEAST16
-#  define SCNdLEAST16 "hd"
-# endif
-# if !defined SCNiLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNiLEAST16
-#  define SCNiLEAST16 "hi"
-# endif
-# if !defined SCNoLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNoLEAST16
-#  define SCNoLEAST16 "ho"
-# endif
-# if !defined SCNuLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNuLEAST16
-#  define SCNuLEAST16 "hu"
-# endif
-# if !defined SCNxLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNxLEAST16
-#  define SCNxLEAST16 "hx"
-# endif
-# if !defined SCNdLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNdLEAST32
-#  define SCNdLEAST32 "d"
-# endif
-# if !defined SCNiLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNiLEAST32
-#  define SCNiLEAST32 "i"
-# endif
-# if !defined SCNoLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNoLEAST32
-#  define SCNoLEAST32 "o"
-# endif
-# if !defined SCNuLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNuLEAST32
-#  define SCNuLEAST32 "u"
-# endif
-# if !defined SCNxLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNxLEAST32
-#  define SCNxLEAST32 "x"
-# endif
-# ifdef INT64_MAX
-#  if !defined SCNdLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNdLEAST64
-#   define SCNdLEAST64 SCNd64
-#  endif
-#  if !defined SCNiLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNiLEAST64
-#   define SCNiLEAST64 SCNi64
-#  endif
+#if !defined SCNdLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNdLEAST8
+# define SCNdLEAST8 "hhd"
+#endif
+#if !defined SCNiLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNiLEAST8
+# define SCNiLEAST8 "hhi"
+#endif
+#if !defined SCNoLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNoLEAST8
+# define SCNoLEAST8 "hho"
+#endif
+#if !defined SCNuLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNuLEAST8
+# define SCNuLEAST8 "hhu"
+#endif
+#if !defined SCNxLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNxLEAST8
+# define SCNxLEAST8 "hhx"
+#endif
+#if !defined SCNdLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNdLEAST16
+# define SCNdLEAST16 "hd"
+#endif
+#if !defined SCNiLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNiLEAST16
+# define SCNiLEAST16 "hi"
+#endif
+#if !defined SCNoLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNoLEAST16
+# define SCNoLEAST16 "ho"
+#endif
+#if !defined SCNuLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNuLEAST16
+# define SCNuLEAST16 "hu"
+#endif
+#if !defined SCNxLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNxLEAST16
+# define SCNxLEAST16 "hx"
+#endif
+#if !defined SCNdLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNdLEAST32
+# define SCNdLEAST32 "d"
+#endif
+#if !defined SCNiLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNiLEAST32
+# define SCNiLEAST32 "i"
+#endif
+#if !defined SCNoLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNoLEAST32
+# define SCNoLEAST32 "o"
+#endif
+#if !defined SCNuLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNuLEAST32
+# define SCNuLEAST32 "u"
+#endif
+#if !defined SCNxLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNxLEAST32
+# define SCNxLEAST32 "x"
+#endif
+#ifdef INT64_MAX
+# if !defined SCNdLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNdLEAST64
+#  define SCNdLEAST64 SCNd64
 # endif
-# ifdef UINT64_MAX
-#  if !defined SCNoLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNoLEAST64
-#   define SCNoLEAST64 SCNo64
-#  endif
-#  if !defined SCNuLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNuLEAST64
-#   define SCNuLEAST64 SCNu64
-#  endif
-#  if !defined SCNxLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNxLEAST64
-#   define SCNxLEAST64 SCNx64
-#  endif
+# if !defined SCNiLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNiLEAST64
+#  define SCNiLEAST64 SCNi64
 # endif
+#endif
+#ifdef UINT64_MAX
+# if !defined SCNoLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNoLEAST64
+#  define SCNoLEAST64 SCNo64
+# endif
+# if !defined SCNuLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNuLEAST64
+#  define SCNuLEAST64 SCNu64
+# endif
+# if !defined SCNxLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNxLEAST64
+#  define SCNxLEAST64 SCNx64
+# endif
+#endif
 
-# if !defined SCNdFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNdFAST8
-#  if INT_FAST8_MAX > INT32_MAX
-#   define SCNdFAST8 SCNd64
-#  elif INT_FAST8_MAX == 0x7fff
-#   define SCNdFAST8 "hd"
-#  elif INT_FAST8_MAX == 0x7f
-#   define SCNdFAST8 "hhd"
-#  else
-#   define SCNdFAST8 "d"
-#  endif
+#if !defined SCNdFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNdFAST8
+# if INT_FAST8_MAX > INT32_MAX
+#  define SCNdFAST8 SCNd64
+# elif INT_FAST8_MAX == 0x7fff
+#  define SCNdFAST8 "hd"
+# elif INT_FAST8_MAX == 0x7f
+#  define SCNdFAST8 "hhd"
+# else
+#  define SCNdFAST8 "d"
 # endif
-# if !defined SCNiFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNiFAST8
-#  if INT_FAST8_MAX > INT32_MAX
-#   define SCNiFAST8 SCNi64
-#  elif INT_FAST8_MAX == 0x7fff
-#   define SCNiFAST8 "hi"
-#  elif INT_FAST8_MAX == 0x7f
-#   define SCNiFAST8 "hhi"
-#  else
-#   define SCNiFAST8 "i"
-#  endif
+#endif
+#if !defined SCNiFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNiFAST8
+# if INT_FAST8_MAX > INT32_MAX
+#  define SCNiFAST8 SCNi64
+# elif INT_FAST8_MAX == 0x7fff
+#  define SCNiFAST8 "hi"
+# elif INT_FAST8_MAX == 0x7f
+#  define SCNiFAST8 "hhi"
+# else
+#  define SCNiFAST8 "i"
 # endif
-# if !defined SCNoFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNoFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define SCNoFAST8 SCNo64
-#  elif UINT_FAST8_MAX == 0xffff
-#   define SCNoFAST8 "ho"
-#  elif UINT_FAST8_MAX == 0xff
-#   define SCNoFAST8 "hho"
-#  else
-#   define SCNoFAST8 "o"
-#  endif
+#endif
+#if !defined SCNoFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNoFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define SCNoFAST8 SCNo64
+# elif UINT_FAST8_MAX == 0xffff
+#  define SCNoFAST8 "ho"
+# elif UINT_FAST8_MAX == 0xff
+#  define SCNoFAST8 "hho"
+# else
+#  define SCNoFAST8 "o"
 # endif
-# if !defined SCNuFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNuFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define SCNuFAST8 SCNu64
-#  elif UINT_FAST8_MAX == 0xffff
-#   define SCNuFAST8 "hu"
-#  elif UINT_FAST8_MAX == 0xff
-#   define SCNuFAST8 "hhu"
-#  else
-#   define SCNuFAST8 "u"
-#  endif
+#endif
+#if !defined SCNuFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNuFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define SCNuFAST8 SCNu64
+# elif UINT_FAST8_MAX == 0xffff
+#  define SCNuFAST8 "hu"
+# elif UINT_FAST8_MAX == 0xff
+#  define SCNuFAST8 "hhu"
+# else
+#  define SCNuFAST8 "u"
 # endif
-# if !defined SCNxFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNxFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define SCNxFAST8 SCNx64
-#  elif UINT_FAST8_MAX == 0xffff
-#   define SCNxFAST8 "hx"
-#  elif UINT_FAST8_MAX == 0xff
-#   define SCNxFAST8 "hhx"
-#  else
-#   define SCNxFAST8 "x"
-#  endif
+#endif
+#if !defined SCNxFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNxFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define SCNxFAST8 SCNx64
+# elif UINT_FAST8_MAX == 0xffff
+#  define SCNxFAST8 "hx"
+# elif UINT_FAST8_MAX == 0xff
+#  define SCNxFAST8 "hhx"
+# else
+#  define SCNxFAST8 "x"
 # endif
-# if !defined SCNdFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNdFAST16
-#  if INT_FAST16_MAX > INT32_MAX
-#   define SCNdFAST16 SCNd64
-#  elif INT_FAST16_MAX == 0x7fff
-#   define SCNdFAST16 "hd"
-#  else
-#   define SCNdFAST16 "d"
-#  endif
+#endif
+#if !defined SCNdFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNdFAST16
+# if INT_FAST16_MAX > INT32_MAX
+#  define SCNdFAST16 SCNd64
+# elif INT_FAST16_MAX == 0x7fff
+#  define SCNdFAST16 "hd"
+# else
+#  define SCNdFAST16 "d"
 # endif
-# if !defined SCNiFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNiFAST16
-#  if INT_FAST16_MAX > INT32_MAX
-#   define SCNiFAST16 SCNi64
-#  elif INT_FAST16_MAX == 0x7fff
-#   define SCNiFAST16 "hi"
-#  else
-#   define SCNiFAST16 "i"
-#  endif
+#endif
+#if !defined SCNiFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNiFAST16
+# if INT_FAST16_MAX > INT32_MAX
+#  define SCNiFAST16 SCNi64
+# elif INT_FAST16_MAX == 0x7fff
+#  define SCNiFAST16 "hi"
+# else
+#  define SCNiFAST16 "i"
 # endif
-# if !defined SCNoFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNoFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define SCNoFAST16 SCNo64
-#  elif UINT_FAST16_MAX == 0xffff
-#   define SCNoFAST16 "ho"
-#  else
-#   define SCNoFAST16 "o"
-#  endif
+#endif
+#if !defined SCNoFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNoFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define SCNoFAST16 SCNo64
+# elif UINT_FAST16_MAX == 0xffff
+#  define SCNoFAST16 "ho"
+# else
+#  define SCNoFAST16 "o"
 # endif
-# if !defined SCNuFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNuFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define SCNuFAST16 SCNu64
-#  elif UINT_FAST16_MAX == 0xffff
-#   define SCNuFAST16 "hu"
-#  else
-#   define SCNuFAST16 "u"
-#  endif
+#endif
+#if !defined SCNuFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNuFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define SCNuFAST16 SCNu64
+# elif UINT_FAST16_MAX == 0xffff
+#  define SCNuFAST16 "hu"
+# else
+#  define SCNuFAST16 "u"
 # endif
-# if !defined SCNxFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNxFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define SCNxFAST16 SCNx64
-#  elif UINT_FAST16_MAX == 0xffff
-#   define SCNxFAST16 "hx"
-#  else
-#   define SCNxFAST16 "x"
-#  endif
+#endif
+#if !defined SCNxFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNxFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define SCNxFAST16 SCNx64
+# elif UINT_FAST16_MAX == 0xffff
+#  define SCNxFAST16 "hx"
+# else
+#  define SCNxFAST16 "x"
 # endif
-# if !defined SCNdFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNdFAST32
-#  if INT_FAST32_MAX > INT32_MAX
-#   define SCNdFAST32 SCNd64
-#  else
-#   define SCNdFAST32 "d"
-#  endif
+#endif
+#if !defined SCNdFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNdFAST32
+# if INT_FAST32_MAX > INT32_MAX
+#  define SCNdFAST32 SCNd64
+# else
+#  define SCNdFAST32 "d"
 # endif
-# if !defined SCNiFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNiFAST32
-#  if INT_FAST32_MAX > INT32_MAX
-#   define SCNiFAST32 SCNi64
-#  else
-#   define SCNiFAST32 "i"
-#  endif
+#endif
+#if !defined SCNiFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNiFAST32
+# if INT_FAST32_MAX > INT32_MAX
+#  define SCNiFAST32 SCNi64
+# else
+#  define SCNiFAST32 "i"
 # endif
-# if !defined SCNoFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNoFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define SCNoFAST32 SCNo64
-#  else
-#   define SCNoFAST32 "o"
-#  endif
+#endif
+#if !defined SCNoFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNoFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define SCNoFAST32 SCNo64
+# else
+#  define SCNoFAST32 "o"
 # endif
-# if !defined SCNuFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNuFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define SCNuFAST32 SCNu64
-#  else
-#   define SCNuFAST32 "u"
-#  endif
+#endif
+#if !defined SCNuFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNuFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define SCNuFAST32 SCNu64
+# else
+#  define SCNuFAST32 "u"
 # endif
-# if !defined SCNxFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNxFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define SCNxFAST32 SCNx64
-#  else
-#   define SCNxFAST32 "x"
-#  endif
+#endif
+#if !defined SCNxFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNxFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define SCNxFAST32 SCNx64
+# else
+#  define SCNxFAST32 "x"
 # endif
-# ifdef INT64_MAX
-#  if !defined SCNdFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNdFAST64
-#   define SCNdFAST64 SCNd64
-#  endif
-#  if !defined SCNiFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNiFAST64
-#   define SCNiFAST64 SCNi64
-#  endif
+#endif
+#ifdef INT64_MAX
+# if !defined SCNdFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNdFAST64
+#  define SCNdFAST64 SCNd64
 # endif
-# ifdef UINT64_MAX
-#  if !defined SCNoFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNoFAST64
-#   define SCNoFAST64 SCNo64
-#  endif
-#  if !defined SCNuFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNuFAST64
-#   define SCNuFAST64 SCNu64
-#  endif
-#  if !defined SCNxFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNxFAST64
-#   define SCNxFAST64 SCNx64
-#  endif
+# if !defined SCNiFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNiFAST64
+#  define SCNiFAST64 SCNi64
 # endif
+#endif
+#ifdef UINT64_MAX
+# if !defined SCNoFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNoFAST64
+#  define SCNoFAST64 SCNo64
+# endif
+# if !defined SCNuFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNuFAST64
+#  define SCNuFAST64 SCNu64
+# endif
+# if !defined SCNxFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNxFAST64
+#  define SCNxFAST64 SCNx64
+# endif
+#endif
 
-# if !defined SCNdMAX || @PRI_MACROS_BROKEN@
-#  undef SCNdMAX
-#  if @INT32_MAX_LT_INTMAX_MAX@
-#   define SCNdMAX SCNd64
-#  else
-#   define SCNdMAX "ld"
-#  endif
+#if !defined SCNdMAX || @PRI_MACROS_BROKEN@
+# undef SCNdMAX
+# if @INT32_MAX_LT_INTMAX_MAX@
+#  define SCNdMAX SCNd64
+# else
+#  define SCNdMAX "ld"
 # endif
-# if !defined SCNiMAX || @PRI_MACROS_BROKEN@
-#  undef SCNiMAX
-#  if @INT32_MAX_LT_INTMAX_MAX@
-#   define SCNiMAX SCNi64
-#  else
-#   define SCNiMAX "li"
-#  endif
+#endif
+#if !defined SCNiMAX || @PRI_MACROS_BROKEN@
+# undef SCNiMAX
+# if @INT32_MAX_LT_INTMAX_MAX@
+#  define SCNiMAX SCNi64
+# else
+#  define SCNiMAX "li"
 # endif
-# if !defined SCNoMAX || @PRI_MACROS_BROKEN@
-#  undef SCNoMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define SCNoMAX SCNo64
-#  else
-#   define SCNoMAX "lo"
-#  endif
+#endif
+#if !defined SCNoMAX || @PRI_MACROS_BROKEN@
+# undef SCNoMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define SCNoMAX SCNo64
+# else
+#  define SCNoMAX "lo"
 # endif
-# if !defined SCNuMAX || @PRI_MACROS_BROKEN@
-#  undef SCNuMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define SCNuMAX SCNu64
-#  else
-#   define SCNuMAX "lu"
-#  endif
+#endif
+#if !defined SCNuMAX || @PRI_MACROS_BROKEN@
+# undef SCNuMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define SCNuMAX SCNu64
+# else
+#  define SCNuMAX "lu"
 # endif
-# if !defined SCNxMAX || @PRI_MACROS_BROKEN@
-#  undef SCNxMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define SCNxMAX SCNx64
-#  else
-#   define SCNxMAX "lx"
-#  endif
+#endif
+#if !defined SCNxMAX || @PRI_MACROS_BROKEN@
+# undef SCNxMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define SCNxMAX SCNx64
+# else
+#  define SCNxMAX "lx"
 # endif
+#endif
 
-# if !defined SCNdPTR || @PRI_MACROS_BROKEN@
-#  undef SCNdPTR
-#  ifdef INTPTR_MAX
-#   define SCNdPTR @PRIPTR_PREFIX@ "d"
-#  endif
+#if !defined SCNdPTR || @PRI_MACROS_BROKEN@
+# undef SCNdPTR
+# ifdef INTPTR_MAX
+#  define SCNdPTR @PRIPTR_PREFIX@ "d"
 # endif
-# if !defined SCNiPTR || @PRI_MACROS_BROKEN@
-#  undef SCNiPTR
-#  ifdef INTPTR_MAX
-#   define SCNiPTR @PRIPTR_PREFIX@ "i"
-#  endif
+#endif
+#if !defined SCNiPTR || @PRI_MACROS_BROKEN@
+# undef SCNiPTR
+# ifdef INTPTR_MAX
+#  define SCNiPTR @PRIPTR_PREFIX@ "i"
 # endif
-# if !defined SCNoPTR || @PRI_MACROS_BROKEN@
-#  undef SCNoPTR
-#  ifdef UINTPTR_MAX
-#   define SCNoPTR @PRIPTR_PREFIX@ "o"
-#  endif
+#endif
+#if !defined SCNoPTR || @PRI_MACROS_BROKEN@
+# undef SCNoPTR
+# ifdef UINTPTR_MAX
+#  define SCNoPTR @PRIPTR_PREFIX@ "o"
 # endif
-# if !defined SCNuPTR || @PRI_MACROS_BROKEN@
-#  undef SCNuPTR
-#  ifdef UINTPTR_MAX
-#   define SCNuPTR @PRIPTR_PREFIX@ "u"
-#  endif
+#endif
+#if !defined SCNuPTR || @PRI_MACROS_BROKEN@
+# undef SCNuPTR
+# ifdef UINTPTR_MAX
+#  define SCNuPTR @PRIPTR_PREFIX@ "u"
 # endif
-# if !defined SCNxPTR || @PRI_MACROS_BROKEN@
-#  undef SCNxPTR
-#  ifdef UINTPTR_MAX
-#   define SCNxPTR @PRIPTR_PREFIX@ "x"
-#  endif
+#endif
+#if !defined SCNxPTR || @PRI_MACROS_BROKEN@
+# undef SCNxPTR
+# ifdef UINTPTR_MAX
+#  define SCNxPTR @PRIPTR_PREFIX@ "x"
 # endif
-
 #endif
 
 /* 7.8.2 Functions for greatest-width integer types */
diff --git a/gltests/lstat.c b/gltests/lstat.c
index d786288..146e5dc 100644
--- a/gltests/lstat.c
+++ b/gltests/lstat.c
@@ -1,6 +1,6 @@
 /* Work around a bug of lstat on some systems
 
-   Copyright (C) 1997-2006, 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-2006, 2008-2012 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/gltests/macros.h b/gltests/macros.h
index adb3744..77a92f8 100644
--- a/gltests/macros.h
+++ b/gltests/macros.h
@@ -1,5 +1,5 @@
 /* Common macros used by gnulib tests.
-   Copyright (C) 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 2006-2012 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/gltests/malloc.c b/gltests/malloc.c
index da45618..ffe042b 100644
--- a/gltests/malloc.c
+++ b/gltests/malloc.c
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2012 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/gltests/malloca.c b/gltests/malloca.c
index ce071f1..3309088 100644
--- a/gltests/malloca.c
+++ b/gltests/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gltests/malloca.h b/gltests/malloca.h
index 7083a58..725cc22 100644
--- a/gltests/malloca.h
+++ b/gltests/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gltests/open.c b/gltests/open.c
index 8dc36ef..27801b9 100644
--- a/gltests/open.c
+++ b/gltests/open.c
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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/gltests/pathmax.h b/gltests/pathmax.h
index c47618a..0fd9296 100644
--- a/gltests/pathmax.h
+++ b/gltests/pathmax.h
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2011 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2012 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/gltests/putenv.c b/gltests/putenv.c
index 2da3376..5f26b66 100644
--- a/gltests/putenv.c
+++ b/gltests/putenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2011 Free Software
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2012 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
diff --git a/gltests/same-inode.h b/gltests/same-inode.h
index d434b94..8c3900d 100644
--- a/gltests/same-inode.h
+++ b/gltests/same-inode.h
@@ -1,6 +1,6 @@
 /* Determine whether two stat buffers refer to the same file.
 
-   Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009-2012 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
@@ -18,8 +18,16 @@
 #ifndef SAME_INODE_H
 # define SAME_INODE_H 1
 
-# define SAME_INODE(Stat_buf_1, Stat_buf_2) \
-   ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
-    && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
+# ifdef __VMS
+#  define SAME_INODE(a, b)             \
+    ((a).st_ino[0] == (b).st_ino[0]    \
+     && (a).st_ino[1] == (b).st_ino[1] \
+     && (a).st_ino[2] == (b).st_ino[2] \
+     && (a).st_dev == (b).st_dev)
+# else
+#  define SAME_INODE(a, b)    \
+    ((a).st_ino == (b).st_ino \
+     && (a).st_dev == (b).st_dev)
+# endif
 
 #endif
diff --git a/gltests/setenv.c b/gltests/setenv.c
index 0a5f67d..3854a99 100644
--- a/gltests/setenv.c
+++ b/gltests/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2011 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gltests/signature.h b/gltests/signature.h
index 8256989..d9d8b47 100644
--- a/gltests/signature.h
+++ b/gltests/signature.h
@@ -1,5 +1,5 @@
 /* Macro for checking that a function declaration is compliant.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/stat.c b/gltests/stat.c
index 1397aa9..9ea53c1 100644
--- a/gltests/stat.c
+++ b/gltests/stat.c
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/stdbool.in.h b/gltests/stdbool.in.h
index b64dc75..cabe4b8 100644
--- a/gltests/stdbool.in.h
+++ b/gltests/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2012 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/gltests/stdint.in.h b/gltests/stdint.in.h
index b6d08c7..6129f1a 100644
--- a/gltests/stdint.in.h
+++ b/gltests/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2012 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -49,6 +49,17 @@
       diagnostics.  */
 #  define __STDINT_H__
 # endif
+
+  /* Some pre-C++11 <stdint.h> implementations need this.  */
+# ifdef __cplusplus
+#  ifndef __STDC_CONSTANT_MACROS
+#   define __STDC_CONSTANT_MACROS 1
+#  endif
+#  ifndef __STDC_LIMIT_MACROS
+#   define __STDC_LIMIT_MACROS 1
+#  endif
+# endif
+
   /* Other systems may have an incomplete or buggy <stdint.h>.
      Include it before <inttypes.h>, since any "#include <stdint.h>"
      in <inttypes.h> would reinclude us, skipping our contents because
@@ -313,8 +324,6 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 
 /* 7.18.2. Limits of specified-width integer types */
 
-#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
-
 /* 7.18.2.1. Limits of exact-width integer types */
 
 /* Here we assume a standard architecture where the hardware integer
@@ -534,12 +543,8 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 #define WINT_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
 
-#endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
-
 /* 7.18.4. Macros for integer constants */
 
-#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
-
 /* 7.18.4.1. Macros for minimum-width integer constants */
 /* According to ISO C 99 Technical Corrigendum 1 */
 
@@ -600,7 +605,5 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 # endif
 #endif
 
-#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
-
 #endif /* _@GUARD_PREFIX@_STDINT_H */
 #endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff --git a/gltests/stdio.in.h b/gltests/stdio.in.h
index ce00af5..07fcef7 100644
--- a/gltests/stdio.in.h
+++ b/gltests/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2012 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/gltests/stdlib.in.h b/gltests/stdlib.in.h
index a59cb08..ea1c1c3 100644
--- a/gltests/stdlib.in.h
+++ b/gltests/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2012 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/gltests/symlink.c b/gltests/symlink.c
index 2896cc9..642ca66 100644
--- a/gltests/symlink.c
+++ b/gltests/symlink.c
@@ -1,5 +1,5 @@
 /* Stub for symlink().
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/sys_stat.in.h b/gltests/sys_stat.in.h
index 77a7177..d93d3fd 100644
--- a/gltests/sys_stat.in.h
+++ b/gltests/sys_stat.in.h
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat header file.
-   Copyright (C) 2005-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 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/gltests/test-alloca-opt.c b/gltests/test-alloca-opt.c
index 5aa1645..4e814c6 100644
--- a/gltests/test-alloca-opt.c
+++ b/gltests/test-alloca-opt.c
@@ -1,5 +1,5 @@
 /* Test of optional automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2012 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/gltests/test-binary-io.c b/gltests/test-binary-io.c
index 468485d..c695454 100644
--- a/gltests/test-binary-io.c
+++ b/gltests/test-binary-io.c
@@ -1,5 +1,5 @@
 /* Test of binary mode I/O.
-   Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2012 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/gltests/test-close.c b/gltests/test-close.c
index 2b87db1..83f71c0 100644
--- a/gltests/test-close.c
+++ b/gltests/test-close.c
@@ -1,5 +1,5 @@
 /* Test closing a file or socket.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-dup2.c b/gltests/test-dup2.c
index a14807a..bf8e5a2 100644
--- a/gltests/test-dup2.c
+++ b/gltests/test-dup2.c
@@ -1,5 +1,5 @@
 /* Test duplicating file descriptors.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-environ.c b/gltests/test-environ.c
index 11df789..972ed06 100644
--- a/gltests/test-environ.c
+++ b/gltests/test-environ.c
@@ -1,5 +1,5 @@
 /* Test of environ variable.
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 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/gltests/test-errno.c b/gltests/test-errno.c
index 7851c22..d9a030f 100644
--- a/gltests/test-errno.c
+++ b/gltests/test-errno.c
@@ -1,5 +1,5 @@
 /* Test of <errno.h> substitute.
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 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/gltests/test-fdopen.c b/gltests/test-fdopen.c
index 304e520..8e2f7bf 100644
--- a/gltests/test-fdopen.c
+++ b/gltests/test-fdopen.c
@@ -1,5 +1,5 @@
 /* Test opening a stream with a file descriptor.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-fgetc.c b/gltests/test-fgetc.c
index 4df46fb..669a71e 100644
--- a/gltests/test-fgetc.c
+++ b/gltests/test-fgetc.c
@@ -1,5 +1,5 @@
 /* Test of fgetc() function.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-fputc.c b/gltests/test-fputc.c
index 03a3716..924c222 100644
--- a/gltests/test-fputc.c
+++ b/gltests/test-fputc.c
@@ -1,5 +1,5 @@
 /* Test of fputc() function.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-fread.c b/gltests/test-fread.c
index e205c9e..fd2ac83 100644
--- a/gltests/test-fread.c
+++ b/gltests/test-fread.c
@@ -1,5 +1,5 @@
 /* Test of fread() function.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-fstat.c b/gltests/test-fstat.c
index 6c120d9..7f3c3c4 100644
--- a/gltests/test-fstat.c
+++ b/gltests/test-fstat.c
@@ -1,5 +1,5 @@
 /* Tests of fstat() function.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-fwrite.c b/gltests/test-fwrite.c
index 76ed05c..d69f463 100644
--- a/gltests/test-fwrite.c
+++ b/gltests/test-fwrite.c
@@ -1,5 +1,5 @@
 /* Test of fwrite() function.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-getcwd-lgpl.c b/gltests/test-getcwd-lgpl.c
index 69a7b90..3010760 100644
--- a/gltests/test-getcwd-lgpl.c
+++ b/gltests/test-getcwd-lgpl.c
@@ -1,5 +1,5 @@
 /* Test of getcwd() function.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-getopt.c b/gltests/test-getopt.c
index 69f2cfa..e08a834 100644
--- a/gltests/test-getopt.c
+++ b/gltests/test-getopt.c
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-getopt.h b/gltests/test-getopt.h
index f7b3911..978b753 100644
--- a/gltests/test-getopt.h
+++ b/gltests/test-getopt.h
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-getopt_long.h b/gltests/test-getopt_long.h
index c1035b1..9d55c65 100644
--- a/gltests/test-getopt_long.h
+++ b/gltests/test-getopt_long.h
@@ -1,5 +1,5 @@
 /* Test of command line argument processing.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-ignore-value.c b/gltests/test-ignore-value.c
index 6953f4c..f036134 100644
--- a/gltests/test-ignore-value.c
+++ b/gltests/test-ignore-value.c
@@ -1,6 +1,6 @@
 /* Test the "ignore-value" module.
 
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-init.sh b/gltests/test-init.sh
new file mode 100755
index 0000000..123da8e
--- /dev/null
+++ b/gltests/test-init.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Unit tests for init.sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# This file is part of the GNUlib Library.
+#
+# 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
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ .
+
+fail=0
+
+test_compare()
+{
+  touch empty || fail=1
+  echo xyz > in || fail=1
+
+  compare /dev/null /dev/null >out 2>err || fail=1
+  test -s out && fail_ "out not empty: $(cat out)"
+  # "err" should be empty, too, but has "set -x" output when VERBOSE=yes
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+
+  compare /dev/null empty >out 2>err || fail=1
+  test -s out && fail_ "out not empty: $(cat out)"
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+
+  compare in in >out 2>err || fail=1
+  test -s out && fail_ "out not empty: $(cat out)"
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+
+  compare /dev/null in >out 2>err && fail=1
+  cat <<\EOF > exp
+diff -u /dev/null in
+--- /dev/null	1970-01-01
++++ in	1970-01-01
++xyz
+EOF
+  compare exp out || fail=1
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+
+  compare empty in >out 2>err && fail=1
+  # Remove the TAB-date suffix on each --- and +++ line,
+  # for both the expected and the actual output files.
+  cat <<\EOF > exp
+--- empty
++++ in
+@@ -0,0 +1 @@
++xyz
+EOF
+  sed 's/	.*//' out > k && mv k out
+  compare exp out || fail=1
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+}
+
+test_compare
+
+Exit $fail
diff --git a/gltests/test-intprops.c b/gltests/test-intprops.c
index 1a34d77..aeb1168 100644
--- a/gltests/test-intprops.c
+++ b/gltests/test-intprops.c
@@ -1,5 +1,5 @@
 /* Test intprops.h.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-inttypes.c b/gltests/test-inttypes.c
index 5bf952c..698d3dc 100644
--- a/gltests/test-inttypes.c
+++ b/gltests/test-inttypes.c
@@ -1,5 +1,5 @@
 /* Test of <inttypes.h> substitute.
-   Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2012 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
@@ -18,9 +18,6 @@
 
 #include <config.h>
 
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_FORMAT_MACROS 1 /* to make it work also in C++ mode */
 #include <inttypes.h>
 
 #include <stddef.h>
diff --git a/gltests/test-lstat.c b/gltests/test-lstat.c
index 372e056..459bf88 100644
--- a/gltests/test-lstat.c
+++ b/gltests/test-lstat.c
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 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/gltests/test-lstat.h b/gltests/test-lstat.h
index 883c4e8..4a81494 100644
--- a/gltests/test-lstat.h
+++ b/gltests/test-lstat.h
@@ -1,5 +1,5 @@
 /* Test of lstat() function.
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 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/gltests/test-malloca.c b/gltests/test-malloca.c
index 92c86f2..d7732c3 100644
--- a/gltests/test-malloca.c
+++ b/gltests/test-malloca.c
@@ -1,5 +1,5 @@
 /* Test of safe automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2012 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/gltests/test-open.c b/gltests/test-open.c
index 3c5b2ab..b9ec9bf 100644
--- a/gltests/test-open.c
+++ b/gltests/test-open.c
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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/gltests/test-open.h b/gltests/test-open.h
index 2ba5d13..cab1d27 100644
--- a/gltests/test-open.h
+++ b/gltests/test-open.h
@@ -1,5 +1,5 @@
 /* Test of opening a file descriptor.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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/gltests/test-pathmax.c b/gltests/test-pathmax.c
index 96a1364..c6d0ccc 100644
--- a/gltests/test-pathmax.c
+++ b/gltests/test-pathmax.c
@@ -1,5 +1,5 @@
 /* Test of "pathmax.h".
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 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/gltests/test-setenv.c b/gltests/test-setenv.c
index 50eb71b..4752a11 100644
--- a/gltests/test-setenv.c
+++ b/gltests/test-setenv.c
@@ -1,5 +1,5 @@
 /* Tests of setenv.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-stat.c b/gltests/test-stat.c
index cd74491..db9adf9 100644
--- a/gltests/test-stat.c
+++ b/gltests/test-stat.c
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-stat.h b/gltests/test-stat.h
index 3c8f7ad..2c9afc0 100644
--- a/gltests/test-stat.h
+++ b/gltests/test-stat.h
@@ -1,5 +1,5 @@
 /* Tests of stat.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-stdbool.c b/gltests/test-stdbool.c
index e115ba2..c22ca1f 100644
--- a/gltests/test-stdbool.c
+++ b/gltests/test-stdbool.c
@@ -1,5 +1,5 @@
 /* Test of <stdbool.h> substitute.
-   Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2002-2007, 2009-2012 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/gltests/test-stddef.c b/gltests/test-stddef.c
index c929af8..d7237b3 100644
--- a/gltests/test-stddef.c
+++ b/gltests/test-stddef.c
@@ -1,5 +1,5 @@
 /* Test of <stddef.h> substitute.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-stdint.c b/gltests/test-stdint.c
index f606cc3..23b2b28 100644
--- a/gltests/test-stdint.c
+++ b/gltests/test-stdint.c
@@ -1,5 +1,5 @@
 /* Test of <stdint.h> substitute.
-   Copyright (C) 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 2006-2012 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
@@ -21,8 +21,6 @@
 /* Whether to enable pedantic checks. */
 #define DO_PEDANTIC 0
 
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_CONSTANT_MACROS 1 /* likewise */
 #include <stdint.h>
 
 #include "verify.h"
diff --git a/gltests/test-stdio.c b/gltests/test-stdio.c
index 7e7a206..7bd67c2 100644
--- a/gltests/test-stdio.c
+++ b/gltests/test-stdio.c
@@ -1,5 +1,5 @@
 /* Test of <stdio.h> substitute.
-   Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2012 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/gltests/test-strerror.c b/gltests/test-strerror.c
index 3ffb12e..a40c079 100644
--- a/gltests/test-strerror.c
+++ b/gltests/test-strerror.c
@@ -1,5 +1,5 @@
 /* Test of strerror() function.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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/gltests/test-symlink.c b/gltests/test-symlink.c
index 367e045..b3caac9 100644
--- a/gltests/test-symlink.c
+++ b/gltests/test-symlink.c
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-symlink.h b/gltests/test-symlink.h
index 4d93929..a7c4079 100644
--- a/gltests/test-symlink.h
+++ b/gltests/test-symlink.h
@@ -1,5 +1,5 @@
 /* Tests of symlink.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-unsetenv.c b/gltests/test-unsetenv.c
index 9c9443b..926526d 100644
--- a/gltests/test-unsetenv.c
+++ b/gltests/test-unsetenv.c
@@ -1,5 +1,5 @@
 /* Tests of unsetenv.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/gltests/test-vc-list-files-cvs.sh b/gltests/test-vc-list-files-cvs.sh
index 531b269..8b17b85 100755
--- a/gltests/test-vc-list-files-cvs.sh
+++ b/gltests/test-vc-list-files-cvs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for vc-list-files
-# Copyright (C) 2008-2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gltests/test-vc-list-files-git.sh b/gltests/test-vc-list-files-git.sh
index 523b2a9..1ea6d89 100755
--- a/gltests/test-vc-list-files-git.sh
+++ b/gltests/test-vc-list-files-git.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Unit tests for vc-list-files
-# Copyright (C) 2008-2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gltests/test-verify.c b/gltests/test-verify.c
index 454f4f4..5ab9c58 100644
--- a/gltests/test-verify.c
+++ b/gltests/test-verify.c
@@ -1,6 +1,6 @@
 /* Test the "verify" module.
 
-   Copyright (C) 2005, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2012 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/gltests/test-version-etc.c b/gltests/test-version-etc.c
index 00a5d7c..36ced60 100644
--- a/gltests/test-version-etc.c
+++ b/gltests/test-version-etc.c
@@ -1,5 +1,5 @@
 /* Test suite for version-etc.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
    This file is part of the GNUlib Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gltests/test-version-etc.sh b/gltests/test-version-etc.sh
index c1ed827..945383b 100755
--- a/gltests/test-version-etc.sh
+++ b/gltests/test-version-etc.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Test suite for version-etc.
-# Copyright (C) 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
 # This file is part of the GNUlib Library.
 #
 # This program is free software: you can redistribute it and/or modify
diff --git a/gltests/time.in.h b/gltests/time.in.h
index 1fbebf4..5080d45 100644
--- a/gltests/time.in.h
+++ b/gltests/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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/gltests/unsetenv.c b/gltests/unsetenv.c
index 16b50d1..b1e659b 100644
--- a/gltests/unsetenv.c
+++ b/gltests/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2011 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gltests/version-etc-fsf.c b/gltests/version-etc-fsf.c
index c821583..c452f40 100644
--- a/gltests/version-etc-fsf.c
+++ b/gltests/version-etc-fsf.c
@@ -1,5 +1,5 @@
 /* Variable with FSF copyright information, for version-etc.
-   Copyright (C) 1999-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1999-2006, 2009-2012 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/gltests/wchar.in.h b/gltests/wchar.in.h
index 1ed4521..86c97ff 100644
--- a/gltests/wchar.in.h
+++ b/gltests/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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/java/Makefile.am b/java/Makefile.am
index 9812013..bdda356 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-# Josefsson
+# Copyright (C) 2004-2012 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/gnu/inet/encoding/IDNA.java b/java/gnu/inet/encoding/IDNA.java
index 070a08b..59a55d2 100644
--- a/java/gnu/inet/encoding/IDNA.java
+++ b/java/gnu/inet/encoding/IDNA.java
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
- * Software Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/gnu/inet/encoding/IDNAException.java b/java/gnu/inet/encoding/IDNAException.java
index fe1c8a3..8a4aff9 100644
--- a/java/gnu/inet/encoding/IDNAException.java
+++ b/java/gnu/inet/encoding/IDNAException.java
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
- * Software Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/gnu/inet/encoding/Makefile.am b/java/gnu/inet/encoding/Makefile.am
index c964caf..e294212 100644
--- a/java/gnu/inet/encoding/Makefile.am
+++ b/java/gnu/inet/encoding/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-# Josefsson.
+# Copyright (C) 2004-2012 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/java/gnu/inet/encoding/NFKC.java b/java/gnu/inet/encoding/NFKC.java
index a96daed..99c6e4d 100644
--- a/java/gnu/inet/encoding/NFKC.java
+++ b/java/gnu/inet/encoding/NFKC.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/gnu/inet/encoding/Punycode.java b/java/gnu/inet/encoding/Punycode.java
index a484f3f..4e04296 100644
--- a/java/gnu/inet/encoding/Punycode.java
+++ b/java/gnu/inet/encoding/Punycode.java
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/gnu/inet/encoding/PunycodeException.java b/java/gnu/inet/encoding/PunycodeException.java
index c8c5705..dbfab6c 100644
--- a/java/gnu/inet/encoding/PunycodeException.java
+++ b/java/gnu/inet/encoding/PunycodeException.java
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/gnu/inet/encoding/Stringprep.java b/java/gnu/inet/encoding/Stringprep.java
index bc26b02..e3c6261 100644
--- a/java/gnu/inet/encoding/Stringprep.java
+++ b/java/gnu/inet/encoding/Stringprep.java
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
- * Software Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/gnu/inet/encoding/StringprepException.java b/java/gnu/inet/encoding/StringprepException.java
index 2e28a66..f84e420 100644
--- a/java/gnu/inet/encoding/StringprepException.java
+++ b/java/gnu/inet/encoding/StringprepException.java
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/misc/GenerateNFKC.java b/java/misc/GenerateNFKC.java
index db7cf75..8dc73be 100644
--- a/java/misc/GenerateNFKC.java
+++ b/java/misc/GenerateNFKC.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/misc/GenerateRFC3454.java b/java/misc/GenerateRFC3454.java
index 226e035..6337b4c 100644
--- a/java/misc/GenerateRFC3454.java
+++ b/java/misc/GenerateRFC3454.java
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/misc/TestIDNA.java b/java/misc/TestIDNA.java
index 51804f2..262238b 100644
--- a/java/misc/TestIDNA.java
+++ b/java/misc/TestIDNA.java
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
- * Software Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/java/misc/TestNFKC.java b/java/misc/TestNFKC.java
index 975fcde..7d71dd8 100644
--- a/java/misc/TestNFKC.java
+++ b/java/misc/TestNFKC.java
@@ -1,6 +1,5 @@
 /**
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
- * Software Foundation, Inc.
+ * Copyright (C) 2004-2012 Free Software Foundation, Inc.
  *
  * Author: Oliver Hitz
  *
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8903070..0ea6a2d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-# 2011 Simon Josefsson.
-# Copyright (C) 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Simon Josefsson.
+# Copyright (C) 2004, 2010-2012 Free Software Foundation, Inc.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/lib/gen-stringprep-tables.pl b/lib/gen-stringprep-tables.pl
index c16efe7..9c98b7b 100755
--- a/lib/gen-stringprep-tables.pl
+++ b/lib/gen-stringprep-tables.pl
@@ -1,7 +1,6 @@
 #! /usr/bin/perl -w
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-# Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/lib/gen-tld-tables.pl b/lib/gen-tld-tables.pl
index b9165e9..928dff9 100755
--- a/lib/gen-tld-tables.pl
+++ b/lib/gen-tld-tables.pl
@@ -2,9 +2,8 @@
 
 # Author: Thomas Jacob, Internet24.de
 
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-# Josefsson.
-# Copyright (C) 2004, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Simon Josefsson.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/lib/gen-unicode-tables.pl b/lib/gen-unicode-tables.pl
index 541e6ca..d43323c 100755
--- a/lib/gen-unicode-tables.pl
+++ b/lib/gen-unicode-tables.pl
@@ -1,7 +1,6 @@
 #! /usr/bin/perl -w
 
-#    Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-#    Josefsson
+#    Copyright (C) 2004-2012 Simon Josefsson
 #    Copyright (C) 1998, 1999 Tom Tromey
 #    Copyright (C) 2001 Red Hat Software
 
diff --git a/lib/gl/Makefile.am b/lib/gl/Makefile.am
index 6d5a059..f3af3c8 100644
--- a/lib/gl/Makefile.am
+++ b/lib/gl/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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/lib/gl/c-ctype.c b/lib/gl/c-ctype.c
index a5e01dc..2cfafe1 100644
--- a/lib/gl/c-ctype.c
+++ b/lib/gl/c-ctype.c
@@ -1,6 +1,6 @@
 /* Character handling in C locale.
 
-   Copyright 2000-2003, 2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright 2000-2003, 2006, 2009-2012 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/lib/gl/c-ctype.h b/lib/gl/c-ctype.h
index 997dd6e..1fc77e6 100644
--- a/lib/gl/c-ctype.h
+++ b/lib/gl/c-ctype.h
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2012 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/lib/gl/c-strcase.h b/lib/gl/c-strcase.h
index ab06af4..56264bc 100644
--- a/lib/gl/c-strcase.h
+++ b/lib/gl/c-strcase.h
@@ -1,5 +1,5 @@
 /* Case-insensitive string comparison functions in C locale.
-   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2011 Free Software
+   Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2012 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gl/c-strcasecmp.c b/lib/gl/c-strcasecmp.c
index bb07dc6..a8c1221 100644
--- a/lib/gl/c-strcasecmp.c
+++ b/lib/gl/c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* c-strcasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2012 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/lib/gl/c-strncasecmp.c b/lib/gl/c-strncasecmp.c
index 87b3e5b..983c1ad 100644
--- a/lib/gl/c-strncasecmp.c
+++ b/lib/gl/c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* c-strncasecmp.c -- case insensitive string comparator in C locale
-   Copyright (C) 1998-1999, 2005-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2006, 2009-2012 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/lib/gl/gettext.h b/lib/gl/gettext.h
index 30c13b3..36bc59a 100644
--- a/lib/gl/gettext.h
+++ b/lib/gl/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2011 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2012 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gl/iconv.c b/lib/gl/iconv.c
index 1d4cb6b..70fc3b4 100644
--- a/lib/gl/iconv.c
+++ b/lib/gl/iconv.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 1999-2001, 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2007, 2009-2012 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/lib/gl/iconv.in.h b/lib/gl/iconv.in.h
index b43755e..e92ceec 100644
--- a/lib/gl/iconv.in.h
+++ b/lib/gl/iconv.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <iconv.h>.
 
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 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/lib/gl/iconv_close.c b/lib/gl/iconv_close.c
index 5c32002..bc8ef71 100644
--- a/lib/gl/iconv_close.c
+++ b/lib/gl/iconv_close.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2012 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/lib/gl/iconv_open.c b/lib/gl/iconv_open.c
index 9ae2f5b..098b184 100644
--- a/lib/gl/iconv_open.c
+++ b/lib/gl/iconv_open.c
@@ -1,5 +1,5 @@
 /* Character set conversion.
-   Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2012 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/lib/gl/m4/00gnulib.m4 b/lib/gl/m4/00gnulib.m4
index 7feed46..d978cb8 100644
--- a/lib/gl/m4/00gnulib.m4
+++ b/lib/gl/m4/00gnulib.m4
@@ -1,5 +1,5 @@
 # 00gnulib.m4 serial 2
-dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2012 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/lib/gl/m4/alloca.m4 b/lib/gl/m4/alloca.m4
index a8744a8..8579bff 100644
--- a/lib/gl/m4/alloca.m4
+++ b/lib/gl/m4/alloca.m4
@@ -1,5 +1,5 @@
 # alloca.m4 serial 13
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2011 Free Software Foundation,
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2012 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/lib/gl/m4/codeset.m4 b/lib/gl/m4/codeset.m4
index da73552..cf53d24 100644
--- a/lib/gl/m4/codeset.m4
+++ b/lib/gl/m4/codeset.m4
@@ -1,5 +1,5 @@
 # codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-2012 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/lib/gl/m4/eealloc.m4 b/lib/gl/m4/eealloc.m4
index 3006c48..75f17e2 100644
--- a/lib/gl/m4/eealloc.m4
+++ b/lib/gl/m4/eealloc.m4
@@ -1,5 +1,5 @@
 # eealloc.m4 serial 2
-dnl Copyright (C) 2003, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2009-2012 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/lib/gl/m4/environ.m4 b/lib/gl/m4/environ.m4
index 6c7982f..8eb57c9 100644
--- a/lib/gl/m4/environ.m4
+++ b/lib/gl/m4/environ.m4
@@ -1,5 +1,5 @@
 # environ.m4 serial 6
-dnl Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2012 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/lib/gl/m4/extensions.m4 b/lib/gl/m4/extensions.m4
index 22156e0..94741cd 100644
--- a/lib/gl/m4/extensions.m4
+++ b/lib/gl/m4/extensions.m4
@@ -1,7 +1,7 @@
 # serial 10  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
-# Copyright (C) 2003, 2006-2011 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2012 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/lib/gl/m4/gnulib-cache.m4 b/lib/gl/m4/gnulib-cache.m4
index 2125224..050b67c 100644
--- a/lib/gl/m4/gnulib-cache.m4
+++ b/lib/gl/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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/lib/gl/m4/gnulib-common.m4 b/lib/gl/m4/gnulib-common.m4
index 8621dec..d1be9e6 100644
--- a/lib/gl/m4/gnulib-common.m4
+++ b/lib/gl/m4/gnulib-common.m4
@@ -1,5 +1,5 @@
 # gnulib-common.m4 serial 31
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/lib/gl/m4/gnulib-comp.m4 b/lib/gl/m4/gnulib-comp.m4
index 62cb1b2..d0eb136 100644
--- a/lib/gl/m4/gnulib-comp.m4
+++ b/lib/gl/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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
@@ -100,6 +100,8 @@ AC_DEFUN([lgl_EARLY],
   # Code from module string:
   # Code from module strverscmp:
   # Code from module strverscmp-tests:
+  # Code from module test-framework-sh:
+  # Code from module test-framework-sh-tests:
   # Code from module thread:
   # Code from module thread-tests:
   # Code from module threadlib:
@@ -459,6 +461,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   tests/test-c-strncasecmp.c
   tests/test-environ.c
   tests/test-iconv.c
+  tests/test-init.sh
   tests/test-intprops.c
   tests/test-inttypes.c
   tests/test-locale.c
diff --git a/lib/gl/m4/gnulib-tool.m4 b/lib/gl/m4/gnulib-tool.m4
index ed41e9d..a09ffc1 100644
--- a/lib/gl/m4/gnulib-tool.m4
+++ b/lib/gl/m4/gnulib-tool.m4
@@ -1,5 +1,5 @@
 # gnulib-tool.m4 serial 2
-dnl Copyright (C) 2004-2005, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2005, 2009-2012 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/lib/gl/m4/iconv.m4 b/lib/gl/m4/iconv.m4
index 98fcd64..6a47236 100644
--- a/lib/gl/m4/iconv.m4
+++ b/lib/gl/m4/iconv.m4
@@ -1,5 +1,5 @@
 # iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2012 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/lib/gl/m4/iconv_h.m4 b/lib/gl/m4/iconv_h.m4
index 8cca7fd..aa86cf8 100644
--- a/lib/gl/m4/iconv_h.m4
+++ b/lib/gl/m4/iconv_h.m4
@@ -1,5 +1,5 @@
 # iconv_h.m4 serial 8
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/lib/gl/m4/iconv_open.m4 b/lib/gl/m4/iconv_open.m4
index accdecc..07f4849 100644
--- a/lib/gl/m4/iconv_open.m4
+++ b/lib/gl/m4/iconv_open.m4
@@ -1,5 +1,5 @@
 # iconv_open.m4 serial 14
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/lib/gl/m4/include_next.m4 b/lib/gl/m4/include_next.m4
index 8a1fab6..6593e03 100644
--- a/lib/gl/m4/include_next.m4
+++ b/lib/gl/m4/include_next.m4
@@ -1,5 +1,5 @@
 # include_next.m4 serial 23
-dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2012 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/lib/gl/m4/inline.m4 b/lib/gl/m4/inline.m4
index a459080..6fa9972 100644
--- a/lib/gl/m4/inline.m4
+++ b/lib/gl/m4/inline.m4
@@ -1,5 +1,5 @@
 # inline.m4 serial 4
-dnl Copyright (C) 2006, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-2012 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/lib/gl/m4/intlmacosx.m4 b/lib/gl/m4/intlmacosx.m4
index 51f8547..dc2ddfe 100644
--- a/lib/gl/m4/intlmacosx.m4
+++ b/lib/gl/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
 # intlmacosx.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2004-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2012 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/lib/gl/m4/inttypes-pri.m4 b/lib/gl/m4/inttypes-pri.m4
index e252b27..977206f 100644
--- a/lib/gl/m4/inttypes-pri.m4
+++ b/lib/gl/m4/inttypes-pri.m4
@@ -1,5 +1,5 @@
 # inttypes-pri.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1997-2002, 2006, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2002, 2006, 2008-2012 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/lib/gl/m4/inttypes.m4 b/lib/gl/m4/inttypes.m4
index cc027a4..989c261 100644
--- a/lib/gl/m4/inttypes.m4
+++ b/lib/gl/m4/inttypes.m4
@@ -1,5 +1,5 @@
-# inttypes.m4 serial 24
-dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
+# inttypes.m4 serial 25
+dnl Copyright (C) 2006-2012 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.
@@ -24,22 +24,6 @@ AC_DEFUN_ONCE([gl_INTTYPES_INCOMPLETE],
 
   AC_REQUIRE([gl_MULTIARCH])
 
-  dnl Ensure that <stdint.h> defines the limit macros, since gnulib's
-  dnl <inttypes.h> relies on them.  This macro is only needed when a
-  dnl C++ compiler is in use; it has no effect for a C compiler.
-  dnl Also be careful to define __STDC_LIMIT_MACROS only when gnulib's
-  dnl <inttypes.h> is going to be created, and to avoid redefinition warnings
-  dnl if the __STDC_LIMIT_MACROS is already defined through the CPPFLAGS.
-  AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], [1],
-    [Define to make the limit macros in <stdint.h> visible.])
-  AH_VERBATIM([__STDC_LIMIT_MACROS_ZZZ],
-[/* Ensure that <stdint.h> defines the limit macros, since gnulib's
-   <inttypes.h> relies on them.  */
-#if defined __cplusplus && !defined __STDC_LIMIT_MACROS && GL_TRIGGER_STDC_LIMIT_MACROS
-# define __STDC_LIMIT_MACROS 1
-#endif
-])
-
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[#include <inttypes.h>
diff --git a/lib/gl/m4/lcmessage.m4 b/lib/gl/m4/lcmessage.m4
index baf41c5..4ed0eb6 100644
--- a/lib/gl/m4/lcmessage.m4
+++ b/lib/gl/m4/lcmessage.m4
@@ -1,5 +1,5 @@
 # lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2011 Free Software Foundation,
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2012 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/lib/gl/m4/ld-output-def.m4 b/lib/gl/m4/ld-output-def.m4
index 2169f51..3511684 100644
--- a/lib/gl/m4/ld-output-def.m4
+++ b/lib/gl/m4/ld-output-def.m4
@@ -1,5 +1,5 @@
 # ld-output-def.m4 serial 2
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2012 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/lib/gl/m4/ld-version-script.m4 b/lib/gl/m4/ld-version-script.m4
index aec2f41..fd8c043 100644
--- a/lib/gl/m4/ld-version-script.m4
+++ b/lib/gl/m4/ld-version-script.m4
@@ -1,5 +1,5 @@
 # ld-version-script.m4 serial 2
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2012 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/lib/gl/m4/lib-ld.m4 b/lib/gl/m4/lib-ld.m4
index ae003f7..4e1374d 100644
--- a/lib/gl/m4/lib-ld.m4
+++ b/lib/gl/m4/lib-ld.m4
@@ -1,5 +1,5 @@
 # lib-ld.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2012 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/lib/gl/m4/lib-link.m4 b/lib/gl/m4/lib-link.m4
index e7c9ba9..d11b4b4 100644
--- a/lib/gl/m4/lib-link.m4
+++ b/lib/gl/m4/lib-link.m4
@@ -1,5 +1,5 @@
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2012 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/lib/gl/m4/lib-prefix.m4 b/lib/gl/m4/lib-prefix.m4
index 7e5f0bd..007aa05 100644
--- a/lib/gl/m4/lib-prefix.m4
+++ b/lib/gl/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2012 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/lib/gl/m4/libunistring-base.m4 b/lib/gl/m4/libunistring-base.m4
index 9831448..d91c42b 100644
--- a/lib/gl/m4/libunistring-base.m4
+++ b/lib/gl/m4/libunistring-base.m4
@@ -1,5 +1,5 @@
 # libunistring-base.m4 serial 5
-dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2012 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/lib/gl/m4/locale-fr.m4 b/lib/gl/m4/locale-fr.m4
index 3f4f954..8450ad4 100644
--- a/lib/gl/m4/locale-fr.m4
+++ b/lib/gl/m4/locale-fr.m4
@@ -1,5 +1,5 @@
 # locale-fr.m4 serial 13
-dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2012 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/lib/gl/m4/locale-ja.m4 b/lib/gl/m4/locale-ja.m4
index d44c2c8..b4c88ab 100644
--- a/lib/gl/m4/locale-ja.m4
+++ b/lib/gl/m4/locale-ja.m4
@@ -1,5 +1,5 @@
 # locale-ja.m4 serial 9
-dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2012 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/lib/gl/m4/locale-tr.m4 b/lib/gl/m4/locale-tr.m4
index 19ded1b..f849808 100644
--- a/lib/gl/m4/locale-tr.m4
+++ b/lib/gl/m4/locale-tr.m4
@@ -1,5 +1,5 @@
 # locale-tr.m4 serial 7
-dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2012 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/lib/gl/m4/locale-zh.m4 b/lib/gl/m4/locale-zh.m4
index 5e06398..92b78a4 100644
--- a/lib/gl/m4/locale-zh.m4
+++ b/lib/gl/m4/locale-zh.m4
@@ -1,5 +1,5 @@
 # locale-zh.m4 serial 9
-dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2012 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/lib/gl/m4/locale_h.m4 b/lib/gl/m4/locale_h.m4
index e77a303..4289587 100644
--- a/lib/gl/m4/locale_h.m4
+++ b/lib/gl/m4/locale_h.m4
@@ -1,5 +1,5 @@
 # locale_h.m4 serial 14
-dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2012 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/lib/gl/m4/localename.m4 b/lib/gl/m4/localename.m4
index 926ada6..2ba295e 100644
--- a/lib/gl/m4/localename.m4
+++ b/lib/gl/m4/localename.m4
@@ -1,5 +1,5 @@
 # localename.m4 serial 2
-dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2012 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/lib/gl/m4/lock.m4 b/lib/gl/m4/lock.m4
index 9686945..c0a6206 100644
--- a/lib/gl/m4/lock.m4
+++ b/lib/gl/m4/lock.m4
@@ -1,5 +1,5 @@
 # lock.m4 serial 11 (gettext-0.18.2)
-dnl Copyright (C) 2005-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2012 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/lib/gl/m4/longlong.m4 b/lib/gl/m4/longlong.m4
index aed816c..42a19ac 100644
--- a/lib/gl/m4/longlong.m4
+++ b/lib/gl/m4/longlong.m4
@@ -1,5 +1,5 @@
 # longlong.m4 serial 16
-dnl Copyright (C) 1999-2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 1999-2007, 2009-2012 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/lib/gl/m4/malloc.m4 b/lib/gl/m4/malloc.m4
index 87018ec..d3c39f5 100644
--- a/lib/gl/m4/malloc.m4
+++ b/lib/gl/m4/malloc.m4
@@ -1,5 +1,5 @@
 # malloc.m4 serial 13
-dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2012 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/lib/gl/m4/malloca.m4 b/lib/gl/m4/malloca.m4
index aec43f5..7841979 100644
--- a/lib/gl/m4/malloca.m4
+++ b/lib/gl/m4/malloca.m4
@@ -1,5 +1,5 @@
 # malloca.m4 serial 1
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2011 Free Software Foundation,
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2012 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/lib/gl/m4/multiarch.m4 b/lib/gl/m4/multiarch.m4
index 691d892..b424dce 100644
--- a/lib/gl/m4/multiarch.m4
+++ b/lib/gl/m4/multiarch.m4
@@ -1,5 +1,5 @@
 # multiarch.m4 serial 6
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2012 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/lib/gl/m4/putenv.m4 b/lib/gl/m4/putenv.m4
index 1497b4a..1cb23a5 100644
--- a/lib/gl/m4/putenv.m4
+++ b/lib/gl/m4/putenv.m4
@@ -1,5 +1,5 @@
 # putenv.m4 serial 18
-dnl Copyright (C) 2002-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2012 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/lib/gl/m4/setenv.m4 b/lib/gl/m4/setenv.m4
index bc215a6..a1f30bc 100644
--- a/lib/gl/m4/setenv.m4
+++ b/lib/gl/m4/setenv.m4
@@ -1,5 +1,5 @@
 # setenv.m4 serial 25
-dnl Copyright (C) 2001-2004, 2006-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2012 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/lib/gl/m4/setlocale.m4 b/lib/gl/m4/setlocale.m4
index d64780d..c605241 100644
--- a/lib/gl/m4/setlocale.m4
+++ b/lib/gl/m4/setlocale.m4
@@ -1,5 +1,5 @@
 # setlocale.m4 serial 4
-dnl Copyright (C) 2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2012 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/lib/gl/m4/ssize_t.m4 b/lib/gl/m4/ssize_t.m4
index d712752..209d64c 100644
--- a/lib/gl/m4/ssize_t.m4
+++ b/lib/gl/m4/ssize_t.m4
@@ -1,5 +1,5 @@
 # ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2012 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/lib/gl/m4/stdbool.m4 b/lib/gl/m4/stdbool.m4
index 1ebf3e6..eabfa64 100644
--- a/lib/gl/m4/stdbool.m4
+++ b/lib/gl/m4/stdbool.m4
@@ -1,6 +1,6 @@
 # Check for stdbool.h that conforms to C99.
 
-dnl Copyright (C) 2002-2006, 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2012 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/lib/gl/m4/stddef_h.m4 b/lib/gl/m4/stddef_h.m4
index 1ae2344..cc11609 100644
--- a/lib/gl/m4/stddef_h.m4
+++ b/lib/gl/m4/stddef_h.m4
@@ -1,6 +1,6 @@
 dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
 # stddef_h.m4 serial 4
-dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2012 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/lib/gl/m4/stdint.m4 b/lib/gl/m4/stdint.m4
index 092161c..28d342e 100644
--- a/lib/gl/m4/stdint.m4
+++ b/lib/gl/m4/stdint.m4
@@ -1,5 +1,5 @@
-# stdint.m4 serial 41
-dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
+# stdint.m4 serial 43
+dnl Copyright (C) 2001-2012 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.
@@ -69,8 +69,6 @@ AC_DEFUN_ONCE([gl_STDINT_H],
       [gl_cv_header_working_stdint_h=no
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([[
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */
@@ -219,8 +217,6 @@ struct s {
           dnl This detects a bug on HP-UX 11.23/ia64.
           AC_RUN_IFELSE([
             AC_LANG_PROGRAM([[
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 ]
diff --git a/lib/gl/m4/stdlib_h.m4 b/lib/gl/m4/stdlib_h.m4
index 0a8a9e5..bcb4cb8 100644
--- a/lib/gl/m4/stdlib_h.m4
+++ b/lib/gl/m4/stdlib_h.m4
@@ -1,5 +1,5 @@
 # stdlib_h.m4 serial 39
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/lib/gl/m4/string_h.m4 b/lib/gl/m4/string_h.m4
index 4f9f511..5677e09 100644
--- a/lib/gl/m4/string_h.m4
+++ b/lib/gl/m4/string_h.m4
@@ -1,6 +1,6 @@
 # Configure a GNU-like replacement for <string.h>.
 
-# Copyright (C) 2007-2011 Free Software Foundation, Inc.
+# Copyright (C) 2007-2012 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/lib/gl/m4/strverscmp.m4 b/lib/gl/m4/strverscmp.m4
index 394b4c3..d744647 100644
--- a/lib/gl/m4/strverscmp.m4
+++ b/lib/gl/m4/strverscmp.m4
@@ -1,5 +1,5 @@
 # strverscmp.m4 serial 8
-dnl Copyright (C) 2002, 2005-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005-2012 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/lib/gl/m4/thread.m4 b/lib/gl/m4/thread.m4
index 49a4bc7..cd66c3e 100644
--- a/lib/gl/m4/thread.m4
+++ b/lib/gl/m4/thread.m4
@@ -1,5 +1,5 @@
 # thread.m4 serial 2
-dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2012 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/lib/gl/m4/threadlib.m4 b/lib/gl/m4/threadlib.m4
index 8a621fd..ed9188a 100644
--- a/lib/gl/m4/threadlib.m4
+++ b/lib/gl/m4/threadlib.m4
@@ -1,5 +1,5 @@
 # threadlib.m4 serial 8 (gettext-0.18.2)
-dnl Copyright (C) 2005-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2012 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/lib/gl/m4/unistd_h.m4 b/lib/gl/m4/unistd_h.m4
index b4eca68..7595534 100644
--- a/lib/gl/m4/unistd_h.m4
+++ b/lib/gl/m4/unistd_h.m4
@@ -1,5 +1,5 @@
-# unistd_h.m4 serial 62
-dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
+# unistd_h.m4 serial 63
+dnl Copyright (C) 2006-2012 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.
@@ -41,10 +41,11 @@ AC_DEFUN([gl_UNISTD_H],
 #endif
     ]], [chdir chown dup dup2 dup3 environ euidaccess faccessat fchdir fchownat
     fdatasync fsync ftruncate getcwd getdomainname getdtablesize getgroups
-    gethostname getlogin getlogin_r getpagesize getusershell setusershell
-    endusershell group_member lchown link linkat lseek pipe pipe2 pread pwrite
-    readlink readlinkat rmdir sleep symlink symlinkat ttyname_r unlink unlinkat
-    usleep])
+    gethostname getlogin getlogin_r getpagesize
+    getusershell setusershell endusershell
+    group_member isatty lchown link linkat lseek pipe pipe2 pread pwrite
+    readlink readlinkat rmdir sethostname sleep symlink symlinkat ttyname_r
+    unlink unlinkat usleep])
 ])
 
 AC_DEFUN([gl_UNISTD_MODULE_INDICATOR],
@@ -82,6 +83,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   GNULIB_GETPAGESIZE=0;          AC_SUBST([GNULIB_GETPAGESIZE])
   GNULIB_GETUSERSHELL=0;         AC_SUBST([GNULIB_GETUSERSHELL])
   GNULIB_GROUP_MEMBER=0;         AC_SUBST([GNULIB_GROUP_MEMBER])
+  GNULIB_ISATTY=0;               AC_SUBST([GNULIB_ISATTY])
   GNULIB_LCHOWN=0;               AC_SUBST([GNULIB_LCHOWN])
   GNULIB_LINK=0;                 AC_SUBST([GNULIB_LINK])
   GNULIB_LINKAT=0;               AC_SUBST([GNULIB_LINKAT])
@@ -94,6 +96,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   GNULIB_READLINK=0;             AC_SUBST([GNULIB_READLINK])
   GNULIB_READLINKAT=0;           AC_SUBST([GNULIB_READLINKAT])
   GNULIB_RMDIR=0;                AC_SUBST([GNULIB_RMDIR])
+  GNULIB_SETHOSTNAME=0;          AC_SUBST([GNULIB_SETHOSTNAME])
   GNULIB_SLEEP=0;                AC_SUBST([GNULIB_SLEEP])
   GNULIB_SYMLINK=0;              AC_SUBST([GNULIB_SYMLINK])
   GNULIB_SYMLINKAT=0;            AC_SUBST([GNULIB_SYMLINKAT])
@@ -130,6 +133,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_PWRITE=1;          AC_SUBST([HAVE_PWRITE])
   HAVE_READLINK=1;        AC_SUBST([HAVE_READLINK])
   HAVE_READLINKAT=1;      AC_SUBST([HAVE_READLINKAT])
+  HAVE_SETHOSTNAME=1;     AC_SUBST([HAVE_SETHOSTNAME])
   HAVE_SLEEP=1;           AC_SUBST([HAVE_SLEEP])
   HAVE_SYMLINK=1;         AC_SUBST([HAVE_SYMLINK])
   HAVE_SYMLINKAT=1;       AC_SUBST([HAVE_SYMLINKAT])
@@ -142,6 +146,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   HAVE_DECL_GETLOGIN_R=1; AC_SUBST([HAVE_DECL_GETLOGIN_R])
   HAVE_DECL_GETPAGESIZE=1; AC_SUBST([HAVE_DECL_GETPAGESIZE])
   HAVE_DECL_GETUSERSHELL=1; AC_SUBST([HAVE_DECL_GETUSERSHELL])
+  HAVE_DECL_SETHOSTNAME=1; AC_SUBST([HAVE_DECL_SETHOSTNAME])
   HAVE_DECL_TTYNAME_R=1;  AC_SUBST([HAVE_DECL_TTYNAME_R])
   HAVE_OS_H=0;            AC_SUBST([HAVE_OS_H])
   HAVE_SYS_PARAM_H=0;     AC_SUBST([HAVE_SYS_PARAM_H])
@@ -155,6 +160,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_GETLOGIN_R=0;   AC_SUBST([REPLACE_GETLOGIN_R])
   REPLACE_GETGROUPS=0;    AC_SUBST([REPLACE_GETGROUPS])
   REPLACE_GETPAGESIZE=0;  AC_SUBST([REPLACE_GETPAGESIZE])
+  REPLACE_ISATTY=0;       AC_SUBST([REPLACE_ISATTY])
   REPLACE_LCHOWN=0;       AC_SUBST([REPLACE_LCHOWN])
   REPLACE_LINK=0;         AC_SUBST([REPLACE_LINK])
   REPLACE_LINKAT=0;       AC_SUBST([REPLACE_LINKAT])
diff --git a/lib/gl/m4/visibility.m4 b/lib/gl/m4/visibility.m4
index 75c34b6..7b24d39 100644
--- a/lib/gl/m4/visibility.m4
+++ b/lib/gl/m4/visibility.m4
@@ -1,5 +1,5 @@
 # visibility.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2005, 2008, 2010-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008, 2010-2012 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/lib/gl/m4/warn-on-use.m4 b/lib/gl/m4/warn-on-use.m4
index f09deef..03b113c 100644
--- a/lib/gl/m4/warn-on-use.m4
+++ b/lib/gl/m4/warn-on-use.m4
@@ -1,5 +1,5 @@
 # warn-on-use.m4 serial 4
-dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2012 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/lib/gl/m4/wchar_h.m4 b/lib/gl/m4/wchar_h.m4
index 977491f..c7a8b2d 100644
--- a/lib/gl/m4/wchar_h.m4
+++ b/lib/gl/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-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2012 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/lib/gl/m4/wchar_t.m4 b/lib/gl/m4/wchar_t.m4
index d2c03c4..534735d 100644
--- a/lib/gl/m4/wchar_t.m4
+++ b/lib/gl/m4/wchar_t.m4
@@ -1,5 +1,5 @@
 # wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2003, 2008-2012 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/lib/gl/m4/wint_t.m4 b/lib/gl/m4/wint_t.m4
index da1ce3d..3260cce 100644
--- a/lib/gl/m4/wint_t.m4
+++ b/lib/gl/m4/wint_t.m4
@@ -1,5 +1,5 @@
 # wint_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2003, 2007-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2012 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/lib/gl/m4/yield.m4 b/lib/gl/m4/yield.m4
index 15d5ac2..94e69c4 100644
--- a/lib/gl/m4/yield.m4
+++ b/lib/gl/m4/yield.m4
@@ -1,5 +1,5 @@
 # yield.m4 serial 2
-dnl Copyright (C) 2005-2011 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2012 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/lib/gl/stdbool.in.h b/lib/gl/stdbool.in.h
index 12efde3..71dbb5c 100644
--- a/lib/gl/stdbool.in.h
+++ b/lib/gl/stdbool.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2003, 2006-2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2003, 2006-2012 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/lib/gl/stddef.in.h b/lib/gl/stddef.in.h
index c13b453..d282610 100644
--- a/lib/gl/stddef.in.h
+++ b/lib/gl/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 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/lib/gl/stdint.in.h b/lib/gl/stdint.in.h
index 38d1774..9799c0d 100644
--- a/lib/gl/stdint.in.h
+++ b/lib/gl/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2012 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -49,6 +49,17 @@
       diagnostics.  */
 #  define __STDINT_H__
 # endif
+
+  /* Some pre-C++11 <stdint.h> implementations need this.  */
+# ifdef __cplusplus
+#  ifndef __STDC_CONSTANT_MACROS
+#   define __STDC_CONSTANT_MACROS 1
+#  endif
+#  ifndef __STDC_LIMIT_MACROS
+#   define __STDC_LIMIT_MACROS 1
+#  endif
+# endif
+
   /* Other systems may have an incomplete or buggy <stdint.h>.
      Include it before <inttypes.h>, since any "#include <stdint.h>"
      in <inttypes.h> would reinclude us, skipping our contents because
@@ -313,8 +324,6 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 
 /* 7.18.2. Limits of specified-width integer types */
 
-#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
-
 /* 7.18.2.1. Limits of exact-width integer types */
 
 /* Here we assume a standard architecture where the hardware integer
@@ -535,12 +544,8 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 #define WINT_MAX  \
    _STDINT_MAX (@HAVE_SIGNED_WINT_T@, @BITSIZEOF_WINT_T@, 0@WINT_T_SUFFIX@)
 
-#endif /* !defined __cplusplus || defined __STDC_LIMIT_MACROS */
-
 /* 7.18.4. Macros for integer constants */
 
-#if ! defined __cplusplus || defined __STDC_CONSTANT_MACROS
-
 /* 7.18.4.1. Macros for minimum-width integer constants */
 /* According to ISO C 99 Technical Corrigendum 1 */
 
@@ -601,7 +606,5 @@ typedef int _verify_intmax_size[sizeof (intmax_t) == sizeof (uintmax_t)
 # endif
 #endif
 
-#endif /* !defined __cplusplus || defined __STDC_CONSTANT_MACROS */
-
 #endif /* _@GUARD_PREFIX@_STDINT_H */
 #endif /* !defined _@GUARD_PREFIX@_STDINT_H && !defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H */
diff --git a/lib/gl/striconv.c b/lib/gl/striconv.c
index 3f3e5ba..01d5fed 100644
--- a/lib/gl/striconv.c
+++ b/lib/gl/striconv.c
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2007, 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2007, 2010-2012 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gl/striconv.h b/lib/gl/striconv.h
index 3072cd7..3b002c2 100644
--- a/lib/gl/striconv.h
+++ b/lib/gl/striconv.h
@@ -1,5 +1,5 @@
 /* Charset conversion.
-   Copyright (C) 2001-2004, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2006-2007, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible and Simon Josefsson.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gl/string.in.h b/lib/gl/string.in.h
index d45b14a..2b84c54 100644
--- a/lib/gl/string.in.h
+++ b/lib/gl/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2012 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/lib/gl/strverscmp.c b/lib/gl/strverscmp.c
index 04aeac2..e1093fb 100644
--- a/lib/gl/strverscmp.c
+++ b/lib/gl/strverscmp.c
@@ -1,5 +1,5 @@
 /* Compare strings while treating digits characters numerically.
-   Copyright (C) 1997, 2000, 2002, 2004, 2006, 2009-2011 Free Software
+   Copyright (C) 1997, 2000, 2002, 2004, 2006, 2009-2012 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jean-FranÃ§ois Bignolles <bignolle@ecoledoc.ibp.fr>, 1997.
diff --git a/lib/gl/unistr.in.h b/lib/gl/unistr.in.h
index 84ff55d..cc27672 100644
--- a/lib/gl/unistr.in.h
+++ b/lib/gl/unistr.in.h
@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2012 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
diff --git a/lib/gl/unistr/u8-mbtoucr.c b/lib/gl/unistr/u8-mbtoucr.c
index e6c45e2..6ba4d17 100644
--- a/lib/gl/unistr/u8-mbtoucr.c
+++ b/lib/gl/unistr/u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Look at first character in UTF-8 string, returning an error code.
-   Copyright (C) 1999-2002, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2006-2007, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/gl/unistr/u8-uctomb-aux.c b/lib/gl/unistr/u8-uctomb-aux.c
index e9e8a8f..c157c72 100644
--- a/lib/gl/unistr/u8-uctomb-aux.c
+++ b/lib/gl/unistr/u8-uctomb-aux.c
@@ -1,5 +1,5 @@
 /* Conversion UCS-4 to UTF-8.
-   Copyright (C) 2002, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/gl/unistr/u8-uctomb.c b/lib/gl/unistr/u8-uctomb.c
index 71b9d0b..a7ffd15 100644
--- a/lib/gl/unistr/u8-uctomb.c
+++ b/lib/gl/unistr/u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Store a character in UTF-8 string.
-   Copyright (C) 2002, 2005-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2002.
 
    This program is free software: you can redistribute it and/or modify it
diff --git a/lib/gl/unitypes.in.h b/lib/gl/unitypes.in.h
index f9120c7..7554856 100644
--- a/lib/gl/unitypes.in.h
+++ b/lib/gl/unitypes.in.h
@@ -1,5 +1,5 @@
 /* Elementary types for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2012 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
diff --git a/lib/gltests/Makefile.am b/lib/gltests/Makefile.am
index dc2622b..df6a4a0 100644
--- a/lib/gltests/Makefile.am
+++ b/lib/gltests/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 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
@@ -592,6 +592,14 @@ EXTRA_DIST += test-strverscmp.c signature.h macros.h
 
 ## end   gnulib module strverscmp-tests
 
+## begin gnulib module test-framework-sh-tests
+
+TESTS += test-init.sh
+EXTRA_DIST += init.sh
+EXTRA_DIST += test-init.sh
+
+## end   gnulib module test-framework-sh-tests
+
 ## begin gnulib module thread
 
 libtests_a_SOURCES += glthread/thread.h glthread/thread.c
@@ -655,6 +663,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \
 	      -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \
 	      -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \
+	      -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \
 	      -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \
 	      -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \
 	      -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \
@@ -667,6 +676,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \
 	      -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \
 	      -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \
+	      -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \
 	      -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \
 	      -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \
 	      -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \
@@ -704,6 +714,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
+	      -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
@@ -716,6 +727,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
+	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
 	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
@@ -730,6 +742,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
 	      -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+	      -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
 	      -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
@@ -816,7 +829,7 @@ EXTRA_DIST += verify.h
 TESTS_ENVIRONMENT += MAKE='$(MAKE)'
 TESTS += test-verify test-verify.sh
 check_PROGRAMS += test-verify
-EXTRA_DIST += test-verify.c test-verify.sh init.sh
+EXTRA_DIST += test-verify.c test-verify.sh
 
 ## end   gnulib module verify-tests
 
diff --git a/lib/gltests/alloca.in.h b/lib/gltests/alloca.in.h
index 5b69c6c..ca9e7fe 100644
--- a/lib/gltests/alloca.in.h
+++ b/lib/gltests/alloca.in.h
@@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2011 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2012 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify it
diff --git a/lib/gltests/glthread/lock.c b/lib/gltests/glthread/lock.c
index 64dbd3f..90cb59d 100644
--- a/lib/gltests/glthread/lock.c
+++ b/lib/gltests/glthread/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/glthread/lock.h b/lib/gltests/glthread/lock.h
index 028d881..ab93f20 100644
--- a/lib/gltests/glthread/lock.h
+++ b/lib/gltests/glthread/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/glthread/thread.c b/lib/gltests/glthread/thread.c
index 83b8c57..4f13a05 100644
--- a/lib/gltests/glthread/thread.c
+++ b/lib/gltests/glthread/thread.c
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/glthread/thread.h b/lib/gltests/glthread/thread.h
index 064d72f..5055c77 100644
--- a/lib/gltests/glthread/thread.h
+++ b/lib/gltests/glthread/thread.h
@@ -1,5 +1,5 @@
 /* Creating and controlling threads.
-   Copyright (C) 2005-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/glthread/threadlib.c b/lib/gltests/glthread/threadlib.c
index 646defa..30d6d51 100644
--- a/lib/gltests/glthread/threadlib.c
+++ b/lib/gltests/glthread/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/glthread/yield.h b/lib/gltests/glthread/yield.h
index 4fa2d8b..f030b98 100644
--- a/lib/gltests/glthread/yield.h
+++ b/lib/gltests/glthread/yield.h
@@ -1,5 +1,5 @@
 /* Yielding the processor to other threads and processes.
-   Copyright (C) 2005-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/init.sh b/lib/gltests/init.sh
index e2f6119..9485492 100644
--- a/lib/gltests/init.sh
+++ b/lib/gltests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2011 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 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
@@ -242,13 +242,13 @@ compare_dev_null_ ()
 
   if test "x$1" = x/dev/null; then
     test -s "$2" || return 0
-    { emit_diff_u_header_ "$@"; sed 's/^/+/' -- "$2"; } >&2
+    emit_diff_u_header_ "$@"; sed 's/^/+/' "$2"
     return 1
   fi
 
   if test "x$2" = x/dev/null; then
     test -s "$1" || return 0
-    { emit_diff_u_header_ "$@"; sed 's/^/-/' -- "$1"; } >&2
+    emit_diff_u_header_ "$@"; sed 's/^/-/' "$1"
     return 1
   fi
 
@@ -304,11 +304,17 @@ fi
 # Otherwise, propagate $? to caller: any diffs have already been printed.
 compare ()
 {
-  compare_dev_null_ "$@"
-  case $? in
-    0|1) return $?;;
-    *) compare_ "$@";;
-  esac
+  # This looks like it can be factored to use a simple "case $?"
+  # after unchecked compare_dev_null_ invocation, but that would
+  # fail in a "set -e" environment.
+  if compare_dev_null_ "$@"; then
+    return 0
+  else
+    case $? in
+      1) return 1;;
+      *) compare_ "$@";;
+    esac
+  fi
 }
 
 # An arbitrary prefix to help distinguish test directories.
@@ -521,7 +527,7 @@ mktempd_ ()
   esac
 
   # First, try to use mktemp.
-  d=`unset TMPDIR; mktemp -d -t -p "$destdir_" "$template_" 2>/dev/null` \
+  d=`unset TMPDIR; { mktemp -d -t -p "$destdir_" "$template_"; } 2>/dev/null` \
     || fail=1
 
   # The resulting name must be in the specified directory.
diff --git a/lib/gltests/intprops.h b/lib/gltests/intprops.h
index 1f6a539..2485c78 100644
--- a/lib/gltests/intprops.h
+++ b/lib/gltests/intprops.h
@@ -1,6 +1,6 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2005, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2005, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/inttypes.in.h b/lib/gltests/inttypes.in.h
index 7abf394..e08a660 100644
--- a/lib/gltests/inttypes.in.h
+++ b/lib/gltests/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2011 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2012 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
@@ -31,6 +31,12 @@
    The include_next requires a split double-inclusion guard.  */
 #if ! defined INTTYPES_H || defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 # if @HAVE_INTTYPES_H@
+
+   /* Some pre-C++11 <stdint.h> implementations need this.  */
+#  if defined __cplusplus && ! defined __STDC_FORMAT_MACROS
+#   define __STDC_FORMAT_MACROS 1
+#  endif
+
 #  @INCLUDE_NEXT@ @NEXT_INTTYPES_H@
 # endif
 #endif
@@ -56,988 +62,984 @@
 
 /* 7.8.1 Macros for format specifiers */
 
-#if ! defined __cplusplus || defined __STDC_FORMAT_MACROS
-
-# if defined _TNS_R_TARGET
+#if defined _TNS_R_TARGET
    /* Tandem NonStop R series and compatible platforms released before
       July 2005 support %Ld but not %lld.  */
-#  define _LONG_LONG_FORMAT_PREFIX "L"
-# else
-#  define _LONG_LONG_FORMAT_PREFIX "ll"
-# endif
+# define _LONG_LONG_FORMAT_PREFIX "L"
+#else
+# define _LONG_LONG_FORMAT_PREFIX "ll"
+#endif
 
-# if !defined PRId8 || @PRI_MACROS_BROKEN@
-#  undef PRId8
-#  ifdef INT8_MAX
-#   define PRId8 "d"
-#  endif
+#if !defined PRId8 || @PRI_MACROS_BROKEN@
+# undef PRId8
+# ifdef INT8_MAX
+#  define PRId8 "d"
 # endif
-# if !defined PRIi8 || @PRI_MACROS_BROKEN@
-#  undef PRIi8
-#  ifdef INT8_MAX
-#   define PRIi8 "i"
-#  endif
+#endif
+#if !defined PRIi8 || @PRI_MACROS_BROKEN@
+# undef PRIi8
+# ifdef INT8_MAX
+#  define PRIi8 "i"
 # endif
-# if !defined PRIo8 || @PRI_MACROS_BROKEN@
-#  undef PRIo8
-#  ifdef UINT8_MAX
-#   define PRIo8 "o"
-#  endif
+#endif
+#if !defined PRIo8 || @PRI_MACROS_BROKEN@
+# undef PRIo8
+# ifdef UINT8_MAX
+#  define PRIo8 "o"
 # endif
-# if !defined PRIu8 || @PRI_MACROS_BROKEN@
-#  undef PRIu8
-#  ifdef UINT8_MAX
-#   define PRIu8 "u"
-#  endif
+#endif
+#if !defined PRIu8 || @PRI_MACROS_BROKEN@
+# undef PRIu8
+# ifdef UINT8_MAX
+#  define PRIu8 "u"
 # endif
-# if !defined PRIx8 || @PRI_MACROS_BROKEN@
-#  undef PRIx8
-#  ifdef UINT8_MAX
-#   define PRIx8 "x"
-#  endif
+#endif
+#if !defined PRIx8 || @PRI_MACROS_BROKEN@
+# undef PRIx8
+# ifdef UINT8_MAX
+#  define PRIx8 "x"
 # endif
-# if !defined PRIX8 || @PRI_MACROS_BROKEN@
-#  undef PRIX8
-#  ifdef UINT8_MAX
-#   define PRIX8 "X"
-#  endif
+#endif
+#if !defined PRIX8 || @PRI_MACROS_BROKEN@
+# undef PRIX8
+# ifdef UINT8_MAX
+#  define PRIX8 "X"
 # endif
-# if !defined PRId16 || @PRI_MACROS_BROKEN@
-#  undef PRId16
-#  ifdef INT16_MAX
-#   define PRId16 "d"
-#  endif
+#endif
+#if !defined PRId16 || @PRI_MACROS_BROKEN@
+# undef PRId16
+# ifdef INT16_MAX
+#  define PRId16 "d"
 # endif
-# if !defined PRIi16 || @PRI_MACROS_BROKEN@
-#  undef PRIi16
-#  ifdef INT16_MAX
-#   define PRIi16 "i"
-#  endif
+#endif
+#if !defined PRIi16 || @PRI_MACROS_BROKEN@
+# undef PRIi16
+# ifdef INT16_MAX
+#  define PRIi16 "i"
 # endif
-# if !defined PRIo16 || @PRI_MACROS_BROKEN@
-#  undef PRIo16
-#  ifdef UINT16_MAX
-#   define PRIo16 "o"
-#  endif
+#endif
+#if !defined PRIo16 || @PRI_MACROS_BROKEN@
+# undef PRIo16
+# ifdef UINT16_MAX
+#  define PRIo16 "o"
 # endif
-# if !defined PRIu16 || @PRI_MACROS_BROKEN@
-#  undef PRIu16
-#  ifdef UINT16_MAX
-#   define PRIu16 "u"
-#  endif
+#endif
+#if !defined PRIu16 || @PRI_MACROS_BROKEN@
+# undef PRIu16
+# ifdef UINT16_MAX
+#  define PRIu16 "u"
 # endif
-# if !defined PRIx16 || @PRI_MACROS_BROKEN@
-#  undef PRIx16
-#  ifdef UINT16_MAX
-#   define PRIx16 "x"
-#  endif
+#endif
+#if !defined PRIx16 || @PRI_MACROS_BROKEN@
+# undef PRIx16
+# ifdef UINT16_MAX
+#  define PRIx16 "x"
 # endif
-# if !defined PRIX16 || @PRI_MACROS_BROKEN@
-#  undef PRIX16
-#  ifdef UINT16_MAX
-#   define PRIX16 "X"
-#  endif
+#endif
+#if !defined PRIX16 || @PRI_MACROS_BROKEN@
+# undef PRIX16
+# ifdef UINT16_MAX
+#  define PRIX16 "X"
 # endif
-# if !defined PRId32 || @PRI_MACROS_BROKEN@
-#  undef PRId32
-#  ifdef INT32_MAX
-#   define PRId32 "d"
-#  endif
+#endif
+#if !defined PRId32 || @PRI_MACROS_BROKEN@
+# undef PRId32
+# ifdef INT32_MAX
+#  define PRId32 "d"
 # endif
-# if !defined PRIi32 || @PRI_MACROS_BROKEN@
-#  undef PRIi32
-#  ifdef INT32_MAX
-#   define PRIi32 "i"
-#  endif
+#endif
+#if !defined PRIi32 || @PRI_MACROS_BROKEN@
+# undef PRIi32
+# ifdef INT32_MAX
+#  define PRIi32 "i"
 # endif
-# if !defined PRIo32 || @PRI_MACROS_BROKEN@
-#  undef PRIo32
-#  ifdef UINT32_MAX
-#   define PRIo32 "o"
-#  endif
+#endif
+#if !defined PRIo32 || @PRI_MACROS_BROKEN@
+# undef PRIo32
+# ifdef UINT32_MAX
+#  define PRIo32 "o"
 # endif
-# if !defined PRIu32 || @PRI_MACROS_BROKEN@
-#  undef PRIu32
-#  ifdef UINT32_MAX
-#   define PRIu32 "u"
-#  endif
+#endif
+#if !defined PRIu32 || @PRI_MACROS_BROKEN@
+# undef PRIu32
+# ifdef UINT32_MAX
+#  define PRIu32 "u"
 # endif
-# if !defined PRIx32 || @PRI_MACROS_BROKEN@
-#  undef PRIx32
-#  ifdef UINT32_MAX
-#   define PRIx32 "x"
-#  endif
+#endif
+#if !defined PRIx32 || @PRI_MACROS_BROKEN@
+# undef PRIx32
+# ifdef UINT32_MAX
+#  define PRIx32 "x"
 # endif
-# if !defined PRIX32 || @PRI_MACROS_BROKEN@
-#  undef PRIX32
-#  ifdef UINT32_MAX
-#   define PRIX32 "X"
-#  endif
+#endif
+#if !defined PRIX32 || @PRI_MACROS_BROKEN@
+# undef PRIX32
+# ifdef UINT32_MAX
+#  define PRIX32 "X"
 # endif
-# ifdef INT64_MAX
-#  if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
-#   define _PRI64_PREFIX "l"
-#  elif defined _MSC_VER || defined __MINGW32__
-#   define _PRI64_PREFIX "I64"
-#  elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#   define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX
-#  endif
-#  if !defined PRId64 || @PRI_MACROS_BROKEN@
-#   undef PRId64
-#   define PRId64 _PRI64_PREFIX "d"
-#  endif
-#  if !defined PRIi64 || @PRI_MACROS_BROKEN@
-#   undef PRIi64
-#   define PRIi64 _PRI64_PREFIX "i"
-#  endif
+#endif
+#ifdef INT64_MAX
+# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
+#  define _PRI64_PREFIX "l"
+# elif defined _MSC_VER || defined __MINGW32__
+#  define _PRI64_PREFIX "I64"
+# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#  define _PRI64_PREFIX _LONG_LONG_FORMAT_PREFIX
+# endif
+# if !defined PRId64 || @PRI_MACROS_BROKEN@
+#  undef PRId64
+#  define PRId64 _PRI64_PREFIX "d"
+# endif
+# if !defined PRIi64 || @PRI_MACROS_BROKEN@
+#  undef PRIi64
+#  define PRIi64 _PRI64_PREFIX "i"
 # endif
-# ifdef UINT64_MAX
-#  if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
-#   define _PRIu64_PREFIX "l"
-#  elif defined _MSC_VER || defined __MINGW32__
-#   define _PRIu64_PREFIX "I64"
-#  elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#   define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX
-#  endif
-#  if !defined PRIo64 || @PRI_MACROS_BROKEN@
-#   undef PRIo64
-#   define PRIo64 _PRIu64_PREFIX "o"
-#  endif
-#  if !defined PRIu64 || @PRI_MACROS_BROKEN@
-#   undef PRIu64
-#   define PRIu64 _PRIu64_PREFIX "u"
-#  endif
-#  if !defined PRIx64 || @PRI_MACROS_BROKEN@
-#   undef PRIx64
-#   define PRIx64 _PRIu64_PREFIX "x"
-#  endif
-#  if !defined PRIX64 || @PRI_MACROS_BROKEN@
-#   undef PRIX64
-#   define PRIX64 _PRIu64_PREFIX "X"
-#  endif
+#endif
+#ifdef UINT64_MAX
+# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
+#  define _PRIu64_PREFIX "l"
+# elif defined _MSC_VER || defined __MINGW32__
+#  define _PRIu64_PREFIX "I64"
+# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#  define _PRIu64_PREFIX _LONG_LONG_FORMAT_PREFIX
+# endif
+# if !defined PRIo64 || @PRI_MACROS_BROKEN@
+#  undef PRIo64
+#  define PRIo64 _PRIu64_PREFIX "o"
+# endif
+# if !defined PRIu64 || @PRI_MACROS_BROKEN@
+#  undef PRIu64
+#  define PRIu64 _PRIu64_PREFIX "u"
+# endif
+# if !defined PRIx64 || @PRI_MACROS_BROKEN@
+#  undef PRIx64
+#  define PRIx64 _PRIu64_PREFIX "x"
+# endif
+# if !defined PRIX64 || @PRI_MACROS_BROKEN@
+#  undef PRIX64
+#  define PRIX64 _PRIu64_PREFIX "X"
 # endif
+#endif
 
-# if !defined PRIdLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIdLEAST8
-#  define PRIdLEAST8 "d"
-# endif
-# if !defined PRIiLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIiLEAST8
-#  define PRIiLEAST8 "i"
-# endif
-# if !defined PRIoLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIoLEAST8
-#  define PRIoLEAST8 "o"
-# endif
-# if !defined PRIuLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIuLEAST8
-#  define PRIuLEAST8 "u"
-# endif
-# if !defined PRIxLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIxLEAST8
-#  define PRIxLEAST8 "x"
-# endif
-# if !defined PRIXLEAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIXLEAST8
-#  define PRIXLEAST8 "X"
-# endif
-# if !defined PRIdLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIdLEAST16
-#  define PRIdLEAST16 "d"
-# endif
-# if !defined PRIiLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIiLEAST16
-#  define PRIiLEAST16 "i"
-# endif
-# if !defined PRIoLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIoLEAST16
-#  define PRIoLEAST16 "o"
-# endif
-# if !defined PRIuLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIuLEAST16
-#  define PRIuLEAST16 "u"
-# endif
-# if !defined PRIxLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIxLEAST16
-#  define PRIxLEAST16 "x"
-# endif
-# if !defined PRIXLEAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIXLEAST16
-#  define PRIXLEAST16 "X"
-# endif
-# if !defined PRIdLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIdLEAST32
-#  define PRIdLEAST32 "d"
-# endif
-# if !defined PRIiLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIiLEAST32
-#  define PRIiLEAST32 "i"
-# endif
-# if !defined PRIoLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIoLEAST32
-#  define PRIoLEAST32 "o"
-# endif
-# if !defined PRIuLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIuLEAST32
-#  define PRIuLEAST32 "u"
-# endif
-# if !defined PRIxLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIxLEAST32
-#  define PRIxLEAST32 "x"
-# endif
-# if !defined PRIXLEAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIXLEAST32
-#  define PRIXLEAST32 "X"
-# endif
-# ifdef INT64_MAX
-#  if !defined PRIdLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIdLEAST64
-#   define PRIdLEAST64 PRId64
-#  endif
-#  if !defined PRIiLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIiLEAST64
-#   define PRIiLEAST64 PRIi64
-#  endif
+#if !defined PRIdLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIdLEAST8
+# define PRIdLEAST8 "d"
+#endif
+#if !defined PRIiLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIiLEAST8
+# define PRIiLEAST8 "i"
+#endif
+#if !defined PRIoLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIoLEAST8
+# define PRIoLEAST8 "o"
+#endif
+#if !defined PRIuLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIuLEAST8
+# define PRIuLEAST8 "u"
+#endif
+#if !defined PRIxLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIxLEAST8
+# define PRIxLEAST8 "x"
+#endif
+#if !defined PRIXLEAST8 || @PRI_MACROS_BROKEN@
+# undef PRIXLEAST8
+# define PRIXLEAST8 "X"
+#endif
+#if !defined PRIdLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIdLEAST16
+# define PRIdLEAST16 "d"
+#endif
+#if !defined PRIiLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIiLEAST16
+# define PRIiLEAST16 "i"
+#endif
+#if !defined PRIoLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIoLEAST16
+# define PRIoLEAST16 "o"
+#endif
+#if !defined PRIuLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIuLEAST16
+# define PRIuLEAST16 "u"
+#endif
+#if !defined PRIxLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIxLEAST16
+# define PRIxLEAST16 "x"
+#endif
+#if !defined PRIXLEAST16 || @PRI_MACROS_BROKEN@
+# undef PRIXLEAST16
+# define PRIXLEAST16 "X"
+#endif
+#if !defined PRIdLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIdLEAST32
+# define PRIdLEAST32 "d"
+#endif
+#if !defined PRIiLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIiLEAST32
+# define PRIiLEAST32 "i"
+#endif
+#if !defined PRIoLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIoLEAST32
+# define PRIoLEAST32 "o"
+#endif
+#if !defined PRIuLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIuLEAST32
+# define PRIuLEAST32 "u"
+#endif
+#if !defined PRIxLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIxLEAST32
+# define PRIxLEAST32 "x"
+#endif
+#if !defined PRIXLEAST32 || @PRI_MACROS_BROKEN@
+# undef PRIXLEAST32
+# define PRIXLEAST32 "X"
+#endif
+#ifdef INT64_MAX
+# if !defined PRIdLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIdLEAST64
+#  define PRIdLEAST64 PRId64
 # endif
-# ifdef UINT64_MAX
-#  if !defined PRIoLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIoLEAST64
-#   define PRIoLEAST64 PRIo64
-#  endif
-#  if !defined PRIuLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIuLEAST64
-#   define PRIuLEAST64 PRIu64
-#  endif
-#  if !defined PRIxLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIxLEAST64
-#   define PRIxLEAST64 PRIx64
-#  endif
-#  if !defined PRIXLEAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIXLEAST64
-#   define PRIXLEAST64 PRIX64
-#  endif
+# if !defined PRIiLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIiLEAST64
+#  define PRIiLEAST64 PRIi64
+# endif
+#endif
+#ifdef UINT64_MAX
+# if !defined PRIoLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIoLEAST64
+#  define PRIoLEAST64 PRIo64
+# endif
+# if !defined PRIuLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIuLEAST64
+#  define PRIuLEAST64 PRIu64
+# endif
+# if !defined PRIxLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIxLEAST64
+#  define PRIxLEAST64 PRIx64
 # endif
+# if !defined PRIXLEAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIXLEAST64
+#  define PRIXLEAST64 PRIX64
+# endif
+#endif
 
-# if !defined PRIdFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIdFAST8
-#  if INT_FAST8_MAX > INT32_MAX
-#   define PRIdFAST8 PRId64
-#  else
-#   define PRIdFAST8 "d"
-#  endif
+#if !defined PRIdFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIdFAST8
+# if INT_FAST8_MAX > INT32_MAX
+#  define PRIdFAST8 PRId64
+# else
+#  define PRIdFAST8 "d"
 # endif
-# if !defined PRIiFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIiFAST8
-#  if INT_FAST8_MAX > INT32_MAX
-#   define PRIiFAST8 PRIi64
-#  else
-#   define PRIiFAST8 "i"
-#  endif
+#endif
+#if !defined PRIiFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIiFAST8
+# if INT_FAST8_MAX > INT32_MAX
+#  define PRIiFAST8 PRIi64
+# else
+#  define PRIiFAST8 "i"
 # endif
-# if !defined PRIoFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIoFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define PRIoFAST8 PRIo64
-#  else
-#   define PRIoFAST8 "o"
-#  endif
+#endif
+#if !defined PRIoFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIoFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define PRIoFAST8 PRIo64
+# else
+#  define PRIoFAST8 "o"
 # endif
-# if !defined PRIuFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIuFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define PRIuFAST8 PRIu64
-#  else
-#   define PRIuFAST8 "u"
-#  endif
+#endif
+#if !defined PRIuFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIuFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define PRIuFAST8 PRIu64
+# else
+#  define PRIuFAST8 "u"
 # endif
-# if !defined PRIxFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIxFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define PRIxFAST8 PRIx64
-#  else
-#   define PRIxFAST8 "x"
-#  endif
+#endif
+#if !defined PRIxFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIxFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define PRIxFAST8 PRIx64
+# else
+#  define PRIxFAST8 "x"
 # endif
-# if !defined PRIXFAST8 || @PRI_MACROS_BROKEN@
-#  undef PRIXFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define PRIXFAST8 PRIX64
-#  else
-#   define PRIXFAST8 "X"
-#  endif
+#endif
+#if !defined PRIXFAST8 || @PRI_MACROS_BROKEN@
+# undef PRIXFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define PRIXFAST8 PRIX64
+# else
+#  define PRIXFAST8 "X"
 # endif
-# if !defined PRIdFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIdFAST16
-#  if INT_FAST16_MAX > INT32_MAX
-#   define PRIdFAST16 PRId64
-#  else
-#   define PRIdFAST16 "d"
-#  endif
+#endif
+#if !defined PRIdFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIdFAST16
+# if INT_FAST16_MAX > INT32_MAX
+#  define PRIdFAST16 PRId64
+# else
+#  define PRIdFAST16 "d"
 # endif
-# if !defined PRIiFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIiFAST16
-#  if INT_FAST16_MAX > INT32_MAX
-#   define PRIiFAST16 PRIi64
-#  else
-#   define PRIiFAST16 "i"
-#  endif
+#endif
+#if !defined PRIiFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIiFAST16
+# if INT_FAST16_MAX > INT32_MAX
+#  define PRIiFAST16 PRIi64
+# else
+#  define PRIiFAST16 "i"
 # endif
-# if !defined PRIoFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIoFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define PRIoFAST16 PRIo64
-#  else
-#   define PRIoFAST16 "o"
-#  endif
+#endif
+#if !defined PRIoFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIoFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define PRIoFAST16 PRIo64
+# else
+#  define PRIoFAST16 "o"
 # endif
-# if !defined PRIuFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIuFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define PRIuFAST16 PRIu64
-#  else
-#   define PRIuFAST16 "u"
-#  endif
+#endif
+#if !defined PRIuFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIuFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define PRIuFAST16 PRIu64
+# else
+#  define PRIuFAST16 "u"
 # endif
-# if !defined PRIxFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIxFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define PRIxFAST16 PRIx64
-#  else
-#   define PRIxFAST16 "x"
-#  endif
+#endif
+#if !defined PRIxFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIxFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define PRIxFAST16 PRIx64
+# else
+#  define PRIxFAST16 "x"
 # endif
-# if !defined PRIXFAST16 || @PRI_MACROS_BROKEN@
-#  undef PRIXFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define PRIXFAST16 PRIX64
-#  else
-#   define PRIXFAST16 "X"
-#  endif
+#endif
+#if !defined PRIXFAST16 || @PRI_MACROS_BROKEN@
+# undef PRIXFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define PRIXFAST16 PRIX64
+# else
+#  define PRIXFAST16 "X"
 # endif
-# if !defined PRIdFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIdFAST32
-#  if INT_FAST32_MAX > INT32_MAX
-#   define PRIdFAST32 PRId64
-#  else
-#   define PRIdFAST32 "d"
-#  endif
+#endif
+#if !defined PRIdFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIdFAST32
+# if INT_FAST32_MAX > INT32_MAX
+#  define PRIdFAST32 PRId64
+# else
+#  define PRIdFAST32 "d"
 # endif
-# if !defined PRIiFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIiFAST32
-#  if INT_FAST32_MAX > INT32_MAX
-#   define PRIiFAST32 PRIi64
-#  else
-#   define PRIiFAST32 "i"
-#  endif
+#endif
+#if !defined PRIiFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIiFAST32
+# if INT_FAST32_MAX > INT32_MAX
+#  define PRIiFAST32 PRIi64
+# else
+#  define PRIiFAST32 "i"
 # endif
-# if !defined PRIoFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIoFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define PRIoFAST32 PRIo64
-#  else
-#   define PRIoFAST32 "o"
-#  endif
+#endif
+#if !defined PRIoFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIoFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define PRIoFAST32 PRIo64
+# else
+#  define PRIoFAST32 "o"
 # endif
-# if !defined PRIuFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIuFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define PRIuFAST32 PRIu64
-#  else
-#   define PRIuFAST32 "u"
-#  endif
+#endif
+#if !defined PRIuFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIuFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define PRIuFAST32 PRIu64
+# else
+#  define PRIuFAST32 "u"
 # endif
-# if !defined PRIxFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIxFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define PRIxFAST32 PRIx64
-#  else
-#   define PRIxFAST32 "x"
-#  endif
+#endif
+#if !defined PRIxFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIxFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define PRIxFAST32 PRIx64
+# else
+#  define PRIxFAST32 "x"
 # endif
-# if !defined PRIXFAST32 || @PRI_MACROS_BROKEN@
-#  undef PRIXFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define PRIXFAST32 PRIX64
-#  else
-#   define PRIXFAST32 "X"
-#  endif
+#endif
+#if !defined PRIXFAST32 || @PRI_MACROS_BROKEN@
+# undef PRIXFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define PRIXFAST32 PRIX64
+# else
+#  define PRIXFAST32 "X"
 # endif
-# ifdef INT64_MAX
-#  if !defined PRIdFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIdFAST64
-#   define PRIdFAST64 PRId64
-#  endif
-#  if !defined PRIiFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIiFAST64
-#   define PRIiFAST64 PRIi64
-#  endif
+#endif
+#ifdef INT64_MAX
+# if !defined PRIdFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIdFAST64
+#  define PRIdFAST64 PRId64
 # endif
-# ifdef UINT64_MAX
-#  if !defined PRIoFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIoFAST64
-#   define PRIoFAST64 PRIo64
-#  endif
-#  if !defined PRIuFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIuFAST64
-#   define PRIuFAST64 PRIu64
-#  endif
-#  if !defined PRIxFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIxFAST64
-#   define PRIxFAST64 PRIx64
-#  endif
-#  if !defined PRIXFAST64 || @PRI_MACROS_BROKEN@
-#   undef PRIXFAST64
-#   define PRIXFAST64 PRIX64
-#  endif
+# if !defined PRIiFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIiFAST64
+#  define PRIiFAST64 PRIi64
+# endif
+#endif
+#ifdef UINT64_MAX
+# if !defined PRIoFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIoFAST64
+#  define PRIoFAST64 PRIo64
+# endif
+# if !defined PRIuFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIuFAST64
+#  define PRIuFAST64 PRIu64
+# endif
+# if !defined PRIxFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIxFAST64
+#  define PRIxFAST64 PRIx64
 # endif
+# if !defined PRIXFAST64 || @PRI_MACROS_BROKEN@
+#  undef PRIXFAST64
+#  define PRIXFAST64 PRIX64
+# endif
+#endif
 
-# if !defined PRIdMAX || @PRI_MACROS_BROKEN@
-#  undef PRIdMAX
-#  if @INT32_MAX_LT_INTMAX_MAX@
-#   define PRIdMAX PRId64
-#  else
-#   define PRIdMAX "ld"
-#  endif
+#if !defined PRIdMAX || @PRI_MACROS_BROKEN@
+# undef PRIdMAX
+# if @INT32_MAX_LT_INTMAX_MAX@
+#  define PRIdMAX PRId64
+# else
+#  define PRIdMAX "ld"
 # endif
-# if !defined PRIiMAX || @PRI_MACROS_BROKEN@
-#  undef PRIiMAX
-#  if @INT32_MAX_LT_INTMAX_MAX@
-#   define PRIiMAX PRIi64
-#  else
-#   define PRIiMAX "li"
-#  endif
+#endif
+#if !defined PRIiMAX || @PRI_MACROS_BROKEN@
+# undef PRIiMAX
+# if @INT32_MAX_LT_INTMAX_MAX@
+#  define PRIiMAX PRIi64
+# else
+#  define PRIiMAX "li"
 # endif
-# if !defined PRIoMAX || @PRI_MACROS_BROKEN@
-#  undef PRIoMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define PRIoMAX PRIo64
-#  else
-#   define PRIoMAX "lo"
-#  endif
+#endif
+#if !defined PRIoMAX || @PRI_MACROS_BROKEN@
+# undef PRIoMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define PRIoMAX PRIo64
+# else
+#  define PRIoMAX "lo"
 # endif
-# if !defined PRIuMAX || @PRI_MACROS_BROKEN@
-#  undef PRIuMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define PRIuMAX PRIu64
-#  else
-#   define PRIuMAX "lu"
-#  endif
+#endif
+#if !defined PRIuMAX || @PRI_MACROS_BROKEN@
+# undef PRIuMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define PRIuMAX PRIu64
+# else
+#  define PRIuMAX "lu"
 # endif
-# if !defined PRIxMAX || @PRI_MACROS_BROKEN@
-#  undef PRIxMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define PRIxMAX PRIx64
-#  else
-#   define PRIxMAX "lx"
-#  endif
+#endif
+#if !defined PRIxMAX || @PRI_MACROS_BROKEN@
+# undef PRIxMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define PRIxMAX PRIx64
+# else
+#  define PRIxMAX "lx"
 # endif
-# if !defined PRIXMAX || @PRI_MACROS_BROKEN@
-#  undef PRIXMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define PRIXMAX PRIX64
-#  else
-#   define PRIXMAX "lX"
-#  endif
+#endif
+#if !defined PRIXMAX || @PRI_MACROS_BROKEN@
+# undef PRIXMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define PRIXMAX PRIX64
+# else
+#  define PRIXMAX "lX"
 # endif
+#endif
 
-# if !defined PRIdPTR || @PRI_MACROS_BROKEN@
-#  undef PRIdPTR
-#  ifdef INTPTR_MAX
-#   define PRIdPTR @PRIPTR_PREFIX@ "d"
-#  endif
+#if !defined PRIdPTR || @PRI_MACROS_BROKEN@
+# undef PRIdPTR
+# ifdef INTPTR_MAX
+#  define PRIdPTR @PRIPTR_PREFIX@ "d"
 # endif
-# if !defined PRIiPTR || @PRI_MACROS_BROKEN@
-#  undef PRIiPTR
-#  ifdef INTPTR_MAX
-#   define PRIiPTR @PRIPTR_PREFIX@ "i"
-#  endif
+#endif
+#if !defined PRIiPTR || @PRI_MACROS_BROKEN@
+# undef PRIiPTR
+# ifdef INTPTR_MAX
+#  define PRIiPTR @PRIPTR_PREFIX@ "i"
 # endif
-# if !defined PRIoPTR || @PRI_MACROS_BROKEN@
-#  undef PRIoPTR
-#  ifdef UINTPTR_MAX
-#   define PRIoPTR @PRIPTR_PREFIX@ "o"
-#  endif
+#endif
+#if !defined PRIoPTR || @PRI_MACROS_BROKEN@
+# undef PRIoPTR
+# ifdef UINTPTR_MAX
+#  define PRIoPTR @PRIPTR_PREFIX@ "o"
 # endif
-# if !defined PRIuPTR || @PRI_MACROS_BROKEN@
-#  undef PRIuPTR
-#  ifdef UINTPTR_MAX
-#   define PRIuPTR @PRIPTR_PREFIX@ "u"
-#  endif
+#endif
+#if !defined PRIuPTR || @PRI_MACROS_BROKEN@
+# undef PRIuPTR
+# ifdef UINTPTR_MAX
+#  define PRIuPTR @PRIPTR_PREFIX@ "u"
 # endif
-# if !defined PRIxPTR || @PRI_MACROS_BROKEN@
-#  undef PRIxPTR
-#  ifdef UINTPTR_MAX
-#   define PRIxPTR @PRIPTR_PREFIX@ "x"
-#  endif
+#endif
+#if !defined PRIxPTR || @PRI_MACROS_BROKEN@
+# undef PRIxPTR
+# ifdef UINTPTR_MAX
+#  define PRIxPTR @PRIPTR_PREFIX@ "x"
 # endif
-# if !defined PRIXPTR || @PRI_MACROS_BROKEN@
-#  undef PRIXPTR
-#  ifdef UINTPTR_MAX
-#   define PRIXPTR @PRIPTR_PREFIX@ "X"
-#  endif
+#endif
+#if !defined PRIXPTR || @PRI_MACROS_BROKEN@
+# undef PRIXPTR
+# ifdef UINTPTR_MAX
+#  define PRIXPTR @PRIPTR_PREFIX@ "X"
 # endif
+#endif
 
-# if !defined SCNd8 || @PRI_MACROS_BROKEN@
-#  undef SCNd8
-#  ifdef INT8_MAX
-#   define SCNd8 "hhd"
-#  endif
+#if !defined SCNd8 || @PRI_MACROS_BROKEN@
+# undef SCNd8
+# ifdef INT8_MAX
+#  define SCNd8 "hhd"
 # endif
-# if !defined SCNi8 || @PRI_MACROS_BROKEN@
-#  undef SCNi8
-#  ifdef INT8_MAX
-#   define SCNi8 "hhi"
-#  endif
+#endif
+#if !defined SCNi8 || @PRI_MACROS_BROKEN@
+# undef SCNi8
+# ifdef INT8_MAX
+#  define SCNi8 "hhi"
 # endif
-# if !defined SCNo8 || @PRI_MACROS_BROKEN@
-#  undef SCNo8
-#  ifdef UINT8_MAX
-#   define SCNo8 "hho"
-#  endif
+#endif
+#if !defined SCNo8 || @PRI_MACROS_BROKEN@
+# undef SCNo8
+# ifdef UINT8_MAX
+#  define SCNo8 "hho"
 # endif
-# if !defined SCNu8 || @PRI_MACROS_BROKEN@
-#  undef SCNu8
-#  ifdef UINT8_MAX
-#   define SCNu8 "hhu"
-#  endif
+#endif
+#if !defined SCNu8 || @PRI_MACROS_BROKEN@
+# undef SCNu8
+# ifdef UINT8_MAX
+#  define SCNu8 "hhu"
 # endif
-# if !defined SCNx8 || @PRI_MACROS_BROKEN@
-#  undef SCNx8
-#  ifdef UINT8_MAX
-#   define SCNx8 "hhx"
-#  endif
+#endif
+#if !defined SCNx8 || @PRI_MACROS_BROKEN@
+# undef SCNx8
+# ifdef UINT8_MAX
+#  define SCNx8 "hhx"
 # endif
-# if !defined SCNd16 || @PRI_MACROS_BROKEN@
-#  undef SCNd16
-#  ifdef INT16_MAX
-#   define SCNd16 "hd"
-#  endif
+#endif
+#if !defined SCNd16 || @PRI_MACROS_BROKEN@
+# undef SCNd16
+# ifdef INT16_MAX
+#  define SCNd16 "hd"
 # endif
-# if !defined SCNi16 || @PRI_MACROS_BROKEN@
-#  undef SCNi16
-#  ifdef INT16_MAX
-#   define SCNi16 "hi"
-#  endif
+#endif
+#if !defined SCNi16 || @PRI_MACROS_BROKEN@
+# undef SCNi16
+# ifdef INT16_MAX
+#  define SCNi16 "hi"
 # endif
-# if !defined SCNo16 || @PRI_MACROS_BROKEN@
-#  undef SCNo16
-#  ifdef UINT16_MAX
-#   define SCNo16 "ho"
-#  endif
+#endif
+#if !defined SCNo16 || @PRI_MACROS_BROKEN@
+# undef SCNo16
+# ifdef UINT16_MAX
+#  define SCNo16 "ho"
 # endif
-# if !defined SCNu16 || @PRI_MACROS_BROKEN@
-#  undef SCNu16
-#  ifdef UINT16_MAX
-#   define SCNu16 "hu"
-#  endif
+#endif
+#if !defined SCNu16 || @PRI_MACROS_BROKEN@
+# undef SCNu16
+# ifdef UINT16_MAX
+#  define SCNu16 "hu"
 # endif
-# if !defined SCNx16 || @PRI_MACROS_BROKEN@
-#  undef SCNx16
-#  ifdef UINT16_MAX
-#   define SCNx16 "hx"
-#  endif
+#endif
+#if !defined SCNx16 || @PRI_MACROS_BROKEN@
+# undef SCNx16
+# ifdef UINT16_MAX
+#  define SCNx16 "hx"
 # endif
-# if !defined SCNd32 || @PRI_MACROS_BROKEN@
-#  undef SCNd32
-#  ifdef INT32_MAX
-#   define SCNd32 "d"
-#  endif
+#endif
+#if !defined SCNd32 || @PRI_MACROS_BROKEN@
+# undef SCNd32
+# ifdef INT32_MAX
+#  define SCNd32 "d"
 # endif
-# if !defined SCNi32 || @PRI_MACROS_BROKEN@
-#  undef SCNi32
-#  ifdef INT32_MAX
-#   define SCNi32 "i"
-#  endif
+#endif
+#if !defined SCNi32 || @PRI_MACROS_BROKEN@
+# undef SCNi32
+# ifdef INT32_MAX
+#  define SCNi32 "i"
 # endif
-# if !defined SCNo32 || @PRI_MACROS_BROKEN@
-#  undef SCNo32
-#  ifdef UINT32_MAX
-#   define SCNo32 "o"
-#  endif
+#endif
+#if !defined SCNo32 || @PRI_MACROS_BROKEN@
+# undef SCNo32
+# ifdef UINT32_MAX
+#  define SCNo32 "o"
 # endif
-# if !defined SCNu32 || @PRI_MACROS_BROKEN@
-#  undef SCNu32
-#  ifdef UINT32_MAX
-#   define SCNu32 "u"
-#  endif
+#endif
+#if !defined SCNu32 || @PRI_MACROS_BROKEN@
+# undef SCNu32
+# ifdef UINT32_MAX
+#  define SCNu32 "u"
 # endif
-# if !defined SCNx32 || @PRI_MACROS_BROKEN@
-#  undef SCNx32
-#  ifdef UINT32_MAX
-#   define SCNx32 "x"
-#  endif
+#endif
+#if !defined SCNx32 || @PRI_MACROS_BROKEN@
+# undef SCNx32
+# ifdef UINT32_MAX
+#  define SCNx32 "x"
 # endif
-# ifdef INT64_MAX
-#  if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
-#   define _SCN64_PREFIX "l"
-#  elif defined _MSC_VER || defined __MINGW32__
-#   define _SCN64_PREFIX "I64"
-#  elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
-#   define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX
-#  endif
-#  if !defined SCNd64 || @PRI_MACROS_BROKEN@
-#   undef SCNd64
-#   define SCNd64 _SCN64_PREFIX "d"
-#  endif
-#  if !defined SCNi64 || @PRI_MACROS_BROKEN@
-#   undef SCNi64
-#   define SCNi64 _SCN64_PREFIX "i"
-#  endif
+#endif
+#ifdef INT64_MAX
+# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @INT64_MAX_EQ_LONG_MAX@)
+#  define _SCN64_PREFIX "l"
+# elif defined _MSC_VER || defined __MINGW32__
+#  define _SCN64_PREFIX "I64"
+# elif @HAVE_LONG_LONG_INT@ && LONG_MAX >> 30 == 1
+#  define _SCN64_PREFIX _LONG_LONG_FORMAT_PREFIX
+# endif
+# if !defined SCNd64 || @PRI_MACROS_BROKEN@
+#  undef SCNd64
+#  define SCNd64 _SCN64_PREFIX "d"
+# endif
+# if !defined SCNi64 || @PRI_MACROS_BROKEN@
+#  undef SCNi64
+#  define SCNi64 _SCN64_PREFIX "i"
 # endif
-# ifdef UINT64_MAX
-#  if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
-#   define _SCNu64_PREFIX "l"
-#  elif defined _MSC_VER || defined __MINGW32__
-#   define _SCNu64_PREFIX "I64"
-#  elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
-#   define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX
-#  endif
-#  if !defined SCNo64 || @PRI_MACROS_BROKEN@
-#   undef SCNo64
-#   define SCNo64 _SCNu64_PREFIX "o"
-#  endif
-#  if !defined SCNu64 || @PRI_MACROS_BROKEN@
-#   undef SCNu64
-#   define SCNu64 _SCNu64_PREFIX "u"
-#  endif
-#  if !defined SCNx64 || @PRI_MACROS_BROKEN@
-#   undef SCNx64
-#   define SCNx64 _SCNu64_PREFIX "x"
-#  endif
+#endif
+#ifdef UINT64_MAX
+# if (@APPLE_UNIVERSAL_BUILD@ ? defined _LP64 : @UINT64_MAX_EQ_ULONG_MAX@)
+#  define _SCNu64_PREFIX "l"
+# elif defined _MSC_VER || defined __MINGW32__
+#  define _SCNu64_PREFIX "I64"
+# elif @HAVE_UNSIGNED_LONG_LONG_INT@ && ULONG_MAX >> 31 == 1
+#  define _SCNu64_PREFIX _LONG_LONG_FORMAT_PREFIX
+# endif
+# if !defined SCNo64 || @PRI_MACROS_BROKEN@
+#  undef SCNo64
+#  define SCNo64 _SCNu64_PREFIX "o"
+# endif
+# if !defined SCNu64 || @PRI_MACROS_BROKEN@
+#  undef SCNu64
+#  define SCNu64 _SCNu64_PREFIX "u"
+# endif
+# if !defined SCNx64 || @PRI_MACROS_BROKEN@
+#  undef SCNx64
+#  define SCNx64 _SCNu64_PREFIX "x"
 # endif
+#endif
 
-# if !defined SCNdLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNdLEAST8
-#  define SCNdLEAST8 "hhd"
-# endif
-# if !defined SCNiLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNiLEAST8
-#  define SCNiLEAST8 "hhi"
-# endif
-# if !defined SCNoLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNoLEAST8
-#  define SCNoLEAST8 "hho"
-# endif
-# if !defined SCNuLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNuLEAST8
-#  define SCNuLEAST8 "hhu"
-# endif
-# if !defined SCNxLEAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNxLEAST8
-#  define SCNxLEAST8 "hhx"
-# endif
-# if !defined SCNdLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNdLEAST16
-#  define SCNdLEAST16 "hd"
-# endif
-# if !defined SCNiLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNiLEAST16
-#  define SCNiLEAST16 "hi"
-# endif
-# if !defined SCNoLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNoLEAST16
-#  define SCNoLEAST16 "ho"
-# endif
-# if !defined SCNuLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNuLEAST16
-#  define SCNuLEAST16 "hu"
-# endif
-# if !defined SCNxLEAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNxLEAST16
-#  define SCNxLEAST16 "hx"
-# endif
-# if !defined SCNdLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNdLEAST32
-#  define SCNdLEAST32 "d"
-# endif
-# if !defined SCNiLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNiLEAST32
-#  define SCNiLEAST32 "i"
-# endif
-# if !defined SCNoLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNoLEAST32
-#  define SCNoLEAST32 "o"
-# endif
-# if !defined SCNuLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNuLEAST32
-#  define SCNuLEAST32 "u"
-# endif
-# if !defined SCNxLEAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNxLEAST32
-#  define SCNxLEAST32 "x"
-# endif
-# ifdef INT64_MAX
-#  if !defined SCNdLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNdLEAST64
-#   define SCNdLEAST64 SCNd64
-#  endif
-#  if !defined SCNiLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNiLEAST64
-#   define SCNiLEAST64 SCNi64
-#  endif
+#if !defined SCNdLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNdLEAST8
+# define SCNdLEAST8 "hhd"
+#endif
+#if !defined SCNiLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNiLEAST8
+# define SCNiLEAST8 "hhi"
+#endif
+#if !defined SCNoLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNoLEAST8
+# define SCNoLEAST8 "hho"
+#endif
+#if !defined SCNuLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNuLEAST8
+# define SCNuLEAST8 "hhu"
+#endif
+#if !defined SCNxLEAST8 || @PRI_MACROS_BROKEN@
+# undef SCNxLEAST8
+# define SCNxLEAST8 "hhx"
+#endif
+#if !defined SCNdLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNdLEAST16
+# define SCNdLEAST16 "hd"
+#endif
+#if !defined SCNiLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNiLEAST16
+# define SCNiLEAST16 "hi"
+#endif
+#if !defined SCNoLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNoLEAST16
+# define SCNoLEAST16 "ho"
+#endif
+#if !defined SCNuLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNuLEAST16
+# define SCNuLEAST16 "hu"
+#endif
+#if !defined SCNxLEAST16 || @PRI_MACROS_BROKEN@
+# undef SCNxLEAST16
+# define SCNxLEAST16 "hx"
+#endif
+#if !defined SCNdLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNdLEAST32
+# define SCNdLEAST32 "d"
+#endif
+#if !defined SCNiLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNiLEAST32
+# define SCNiLEAST32 "i"
+#endif
+#if !defined SCNoLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNoLEAST32
+# define SCNoLEAST32 "o"
+#endif
+#if !defined SCNuLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNuLEAST32
+# define SCNuLEAST32 "u"
+#endif
+#if !defined SCNxLEAST32 || @PRI_MACROS_BROKEN@
+# undef SCNxLEAST32
+# define SCNxLEAST32 "x"
+#endif
+#ifdef INT64_MAX
+# if !defined SCNdLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNdLEAST64
+#  define SCNdLEAST64 SCNd64
 # endif
-# ifdef UINT64_MAX
-#  if !defined SCNoLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNoLEAST64
-#   define SCNoLEAST64 SCNo64
-#  endif
-#  if !defined SCNuLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNuLEAST64
-#   define SCNuLEAST64 SCNu64
-#  endif
-#  if !defined SCNxLEAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNxLEAST64
-#   define SCNxLEAST64 SCNx64
-#  endif
+# if !defined SCNiLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNiLEAST64
+#  define SCNiLEAST64 SCNi64
 # endif
+#endif
+#ifdef UINT64_MAX
+# if !defined SCNoLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNoLEAST64
+#  define SCNoLEAST64 SCNo64
+# endif
+# if !defined SCNuLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNuLEAST64
+#  define SCNuLEAST64 SCNu64
+# endif
+# if !defined SCNxLEAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNxLEAST64
+#  define SCNxLEAST64 SCNx64
+# endif
+#endif
 
-# if !defined SCNdFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNdFAST8
-#  if INT_FAST8_MAX > INT32_MAX
-#   define SCNdFAST8 SCNd64
-#  elif INT_FAST8_MAX == 0x7fff
-#   define SCNdFAST8 "hd"
-#  elif INT_FAST8_MAX == 0x7f
-#   define SCNdFAST8 "hhd"
-#  else
-#   define SCNdFAST8 "d"
-#  endif
+#if !defined SCNdFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNdFAST8
+# if INT_FAST8_MAX > INT32_MAX
+#  define SCNdFAST8 SCNd64
+# elif INT_FAST8_MAX == 0x7fff
+#  define SCNdFAST8 "hd"
+# elif INT_FAST8_MAX == 0x7f
+#  define SCNdFAST8 "hhd"
+# else
+#  define SCNdFAST8 "d"
 # endif
-# if !defined SCNiFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNiFAST8
-#  if INT_FAST8_MAX > INT32_MAX
-#   define SCNiFAST8 SCNi64
-#  elif INT_FAST8_MAX == 0x7fff
-#   define SCNiFAST8 "hi"
-#  elif INT_FAST8_MAX == 0x7f
-#   define SCNiFAST8 "hhi"
-#  else
-#   define SCNiFAST8 "i"
-#  endif
+#endif
+#if !defined SCNiFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNiFAST8
+# if INT_FAST8_MAX > INT32_MAX
+#  define SCNiFAST8 SCNi64
+# elif INT_FAST8_MAX == 0x7fff
+#  define SCNiFAST8 "hi"
+# elif INT_FAST8_MAX == 0x7f
+#  define SCNiFAST8 "hhi"
+# else
+#  define SCNiFAST8 "i"
 # endif
-# if !defined SCNoFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNoFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define SCNoFAST8 SCNo64
-#  elif UINT_FAST8_MAX == 0xffff
-#   define SCNoFAST8 "ho"
-#  elif UINT_FAST8_MAX == 0xff
-#   define SCNoFAST8 "hho"
-#  else
-#   define SCNoFAST8 "o"
-#  endif
+#endif
+#if !defined SCNoFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNoFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define SCNoFAST8 SCNo64
+# elif UINT_FAST8_MAX == 0xffff
+#  define SCNoFAST8 "ho"
+# elif UINT_FAST8_MAX == 0xff
+#  define SCNoFAST8 "hho"
+# else
+#  define SCNoFAST8 "o"
 # endif
-# if !defined SCNuFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNuFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define SCNuFAST8 SCNu64
-#  elif UINT_FAST8_MAX == 0xffff
-#   define SCNuFAST8 "hu"
-#  elif UINT_FAST8_MAX == 0xff
-#   define SCNuFAST8 "hhu"
-#  else
-#   define SCNuFAST8 "u"
-#  endif
+#endif
+#if !defined SCNuFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNuFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define SCNuFAST8 SCNu64
+# elif UINT_FAST8_MAX == 0xffff
+#  define SCNuFAST8 "hu"
+# elif UINT_FAST8_MAX == 0xff
+#  define SCNuFAST8 "hhu"
+# else
+#  define SCNuFAST8 "u"
 # endif
-# if !defined SCNxFAST8 || @PRI_MACROS_BROKEN@
-#  undef SCNxFAST8
-#  if UINT_FAST8_MAX > UINT32_MAX
-#   define SCNxFAST8 SCNx64
-#  elif UINT_FAST8_MAX == 0xffff
-#   define SCNxFAST8 "hx"
-#  elif UINT_FAST8_MAX == 0xff
-#   define SCNxFAST8 "hhx"
-#  else
-#   define SCNxFAST8 "x"
-#  endif
+#endif
+#if !defined SCNxFAST8 || @PRI_MACROS_BROKEN@
+# undef SCNxFAST8
+# if UINT_FAST8_MAX > UINT32_MAX
+#  define SCNxFAST8 SCNx64
+# elif UINT_FAST8_MAX == 0xffff
+#  define SCNxFAST8 "hx"
+# elif UINT_FAST8_MAX == 0xff
+#  define SCNxFAST8 "hhx"
+# else
+#  define SCNxFAST8 "x"
 # endif
-# if !defined SCNdFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNdFAST16
-#  if INT_FAST16_MAX > INT32_MAX
-#   define SCNdFAST16 SCNd64
-#  elif INT_FAST16_MAX == 0x7fff
-#   define SCNdFAST16 "hd"
-#  else
-#   define SCNdFAST16 "d"
-#  endif
+#endif
+#if !defined SCNdFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNdFAST16
+# if INT_FAST16_MAX > INT32_MAX
+#  define SCNdFAST16 SCNd64
+# elif INT_FAST16_MAX == 0x7fff
+#  define SCNdFAST16 "hd"
+# else
+#  define SCNdFAST16 "d"
 # endif
-# if !defined SCNiFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNiFAST16
-#  if INT_FAST16_MAX > INT32_MAX
-#   define SCNiFAST16 SCNi64
-#  elif INT_FAST16_MAX == 0x7fff
-#   define SCNiFAST16 "hi"
-#  else
-#   define SCNiFAST16 "i"
-#  endif
+#endif
+#if !defined SCNiFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNiFAST16
+# if INT_FAST16_MAX > INT32_MAX
+#  define SCNiFAST16 SCNi64
+# elif INT_FAST16_MAX == 0x7fff
+#  define SCNiFAST16 "hi"
+# else
+#  define SCNiFAST16 "i"
 # endif
-# if !defined SCNoFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNoFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define SCNoFAST16 SCNo64
-#  elif UINT_FAST16_MAX == 0xffff
-#   define SCNoFAST16 "ho"
-#  else
-#   define SCNoFAST16 "o"
-#  endif
+#endif
+#if !defined SCNoFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNoFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define SCNoFAST16 SCNo64
+# elif UINT_FAST16_MAX == 0xffff
+#  define SCNoFAST16 "ho"
+# else
+#  define SCNoFAST16 "o"
 # endif
-# if !defined SCNuFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNuFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define SCNuFAST16 SCNu64
-#  elif UINT_FAST16_MAX == 0xffff
-#   define SCNuFAST16 "hu"
-#  else
-#   define SCNuFAST16 "u"
-#  endif
+#endif
+#if !defined SCNuFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNuFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define SCNuFAST16 SCNu64
+# elif UINT_FAST16_MAX == 0xffff
+#  define SCNuFAST16 "hu"
+# else
+#  define SCNuFAST16 "u"
 # endif
-# if !defined SCNxFAST16 || @PRI_MACROS_BROKEN@
-#  undef SCNxFAST16
-#  if UINT_FAST16_MAX > UINT32_MAX
-#   define SCNxFAST16 SCNx64
-#  elif UINT_FAST16_MAX == 0xffff
-#   define SCNxFAST16 "hx"
-#  else
-#   define SCNxFAST16 "x"
-#  endif
+#endif
+#if !defined SCNxFAST16 || @PRI_MACROS_BROKEN@
+# undef SCNxFAST16
+# if UINT_FAST16_MAX > UINT32_MAX
+#  define SCNxFAST16 SCNx64
+# elif UINT_FAST16_MAX == 0xffff
+#  define SCNxFAST16 "hx"
+# else
+#  define SCNxFAST16 "x"
 # endif
-# if !defined SCNdFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNdFAST32
-#  if INT_FAST32_MAX > INT32_MAX
-#   define SCNdFAST32 SCNd64
-#  else
-#   define SCNdFAST32 "d"
-#  endif
+#endif
+#if !defined SCNdFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNdFAST32
+# if INT_FAST32_MAX > INT32_MAX
+#  define SCNdFAST32 SCNd64
+# else
+#  define SCNdFAST32 "d"
 # endif
-# if !defined SCNiFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNiFAST32
-#  if INT_FAST32_MAX > INT32_MAX
-#   define SCNiFAST32 SCNi64
-#  else
-#   define SCNiFAST32 "i"
-#  endif
+#endif
+#if !defined SCNiFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNiFAST32
+# if INT_FAST32_MAX > INT32_MAX
+#  define SCNiFAST32 SCNi64
+# else
+#  define SCNiFAST32 "i"
 # endif
-# if !defined SCNoFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNoFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define SCNoFAST32 SCNo64
-#  else
-#   define SCNoFAST32 "o"
-#  endif
+#endif
+#if !defined SCNoFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNoFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define SCNoFAST32 SCNo64
+# else
+#  define SCNoFAST32 "o"
 # endif
-# if !defined SCNuFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNuFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define SCNuFAST32 SCNu64
-#  else
-#   define SCNuFAST32 "u"
-#  endif
+#endif
+#if !defined SCNuFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNuFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define SCNuFAST32 SCNu64
+# else
+#  define SCNuFAST32 "u"
 # endif
-# if !defined SCNxFAST32 || @PRI_MACROS_BROKEN@
-#  undef SCNxFAST32
-#  if UINT_FAST32_MAX > UINT32_MAX
-#   define SCNxFAST32 SCNx64
-#  else
-#   define SCNxFAST32 "x"
-#  endif
+#endif
+#if !defined SCNxFAST32 || @PRI_MACROS_BROKEN@
+# undef SCNxFAST32
+# if UINT_FAST32_MAX > UINT32_MAX
+#  define SCNxFAST32 SCNx64
+# else
+#  define SCNxFAST32 "x"
 # endif
-# ifdef INT64_MAX
-#  if !defined SCNdFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNdFAST64
-#   define SCNdFAST64 SCNd64
-#  endif
-#  if !defined SCNiFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNiFAST64
-#   define SCNiFAST64 SCNi64
-#  endif
+#endif
+#ifdef INT64_MAX
+# if !defined SCNdFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNdFAST64
+#  define SCNdFAST64 SCNd64
 # endif
-# ifdef UINT64_MAX
-#  if !defined SCNoFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNoFAST64
-#   define SCNoFAST64 SCNo64
-#  endif
-#  if !defined SCNuFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNuFAST64
-#   define SCNuFAST64 SCNu64
-#  endif
-#  if !defined SCNxFAST64 || @PRI_MACROS_BROKEN@
-#   undef SCNxFAST64
-#   define SCNxFAST64 SCNx64
-#  endif
+# if !defined SCNiFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNiFAST64
+#  define SCNiFAST64 SCNi64
 # endif
+#endif
+#ifdef UINT64_MAX
+# if !defined SCNoFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNoFAST64
+#  define SCNoFAST64 SCNo64
+# endif
+# if !defined SCNuFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNuFAST64
+#  define SCNuFAST64 SCNu64
+# endif
+# if !defined SCNxFAST64 || @PRI_MACROS_BROKEN@
+#  undef SCNxFAST64
+#  define SCNxFAST64 SCNx64
+# endif
+#endif
 
-# if !defined SCNdMAX || @PRI_MACROS_BROKEN@
-#  undef SCNdMAX
-#  if @INT32_MAX_LT_INTMAX_MAX@
-#   define SCNdMAX SCNd64
-#  else
-#   define SCNdMAX "ld"
-#  endif
+#if !defined SCNdMAX || @PRI_MACROS_BROKEN@
+# undef SCNdMAX
+# if @INT32_MAX_LT_INTMAX_MAX@
+#  define SCNdMAX SCNd64
+# else
+#  define SCNdMAX "ld"
 # endif
-# if !defined SCNiMAX || @PRI_MACROS_BROKEN@
-#  undef SCNiMAX
-#  if @INT32_MAX_LT_INTMAX_MAX@
-#   define SCNiMAX SCNi64
-#  else
-#   define SCNiMAX "li"
-#  endif
+#endif
+#if !defined SCNiMAX || @PRI_MACROS_BROKEN@
+# undef SCNiMAX
+# if @INT32_MAX_LT_INTMAX_MAX@
+#  define SCNiMAX SCNi64
+# else
+#  define SCNiMAX "li"
 # endif
-# if !defined SCNoMAX || @PRI_MACROS_BROKEN@
-#  undef SCNoMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define SCNoMAX SCNo64
-#  else
-#   define SCNoMAX "lo"
-#  endif
+#endif
+#if !defined SCNoMAX || @PRI_MACROS_BROKEN@
+# undef SCNoMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define SCNoMAX SCNo64
+# else
+#  define SCNoMAX "lo"
 # endif
-# if !defined SCNuMAX || @PRI_MACROS_BROKEN@
-#  undef SCNuMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define SCNuMAX SCNu64
-#  else
-#   define SCNuMAX "lu"
-#  endif
+#endif
+#if !defined SCNuMAX || @PRI_MACROS_BROKEN@
+# undef SCNuMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define SCNuMAX SCNu64
+# else
+#  define SCNuMAX "lu"
 # endif
-# if !defined SCNxMAX || @PRI_MACROS_BROKEN@
-#  undef SCNxMAX
-#  if @UINT32_MAX_LT_UINTMAX_MAX@
-#   define SCNxMAX SCNx64
-#  else
-#   define SCNxMAX "lx"
-#  endif
+#endif
+#if !defined SCNxMAX || @PRI_MACROS_BROKEN@
+# undef SCNxMAX
+# if @UINT32_MAX_LT_UINTMAX_MAX@
+#  define SCNxMAX SCNx64
+# else
+#  define SCNxMAX "lx"
 # endif
+#endif
 
-# if !defined SCNdPTR || @PRI_MACROS_BROKEN@
-#  undef SCNdPTR
-#  ifdef INTPTR_MAX
-#   define SCNdPTR @PRIPTR_PREFIX@ "d"
-#  endif
+#if !defined SCNdPTR || @PRI_MACROS_BROKEN@
+# undef SCNdPTR
+# ifdef INTPTR_MAX
+#  define SCNdPTR @PRIPTR_PREFIX@ "d"
 # endif
-# if !defined SCNiPTR || @PRI_MACROS_BROKEN@
-#  undef SCNiPTR
-#  ifdef INTPTR_MAX
-#   define SCNiPTR @PRIPTR_PREFIX@ "i"
-#  endif
+#endif
+#if !defined SCNiPTR || @PRI_MACROS_BROKEN@
+# undef SCNiPTR
+# ifdef INTPTR_MAX
+#  define SCNiPTR @PRIPTR_PREFIX@ "i"
 # endif
-# if !defined SCNoPTR || @PRI_MACROS_BROKEN@
-#  undef SCNoPTR
-#  ifdef UINTPTR_MAX
-#   define SCNoPTR @PRIPTR_PREFIX@ "o"
-#  endif
+#endif
+#if !defined SCNoPTR || @PRI_MACROS_BROKEN@
+# undef SCNoPTR
+# ifdef UINTPTR_MAX
+#  define SCNoPTR @PRIPTR_PREFIX@ "o"
 # endif
-# if !defined SCNuPTR || @PRI_MACROS_BROKEN@
-#  undef SCNuPTR
-#  ifdef UINTPTR_MAX
-#   define SCNuPTR @PRIPTR_PREFIX@ "u"
-#  endif
+#endif
+#if !defined SCNuPTR || @PRI_MACROS_BROKEN@
+# undef SCNuPTR
+# ifdef UINTPTR_MAX
+#  define SCNuPTR @PRIPTR_PREFIX@ "u"
 # endif
-# if !defined SCNxPTR || @PRI_MACROS_BROKEN@
-#  undef SCNxPTR
-#  ifdef UINTPTR_MAX
-#   define SCNxPTR @PRIPTR_PREFIX@ "x"
-#  endif
+#endif
+#if !defined SCNxPTR || @PRI_MACROS_BROKEN@
+# undef SCNxPTR
+# ifdef UINTPTR_MAX
+#  define SCNxPTR @PRIPTR_PREFIX@ "x"
 # endif
-
 #endif
 
 /* 7.8.2 Functions for greatest-width integer types */
diff --git a/lib/gltests/locale.in.h b/lib/gltests/locale.in.h
index 79c1490..a97e3e7 100644
--- a/lib/gltests/locale.in.h
+++ b/lib/gltests/locale.in.h
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/localename.c b/lib/gltests/localename.c
index faab700..7c39bcd 100644
--- a/lib/gltests/localename.c
+++ b/lib/gltests/localename.c
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 1995-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/localename.h b/lib/gltests/localename.h
index ea59f51..330932d 100644
--- a/lib/gltests/localename.h
+++ b/lib/gltests/localename.h
@@ -1,5 +1,5 @@
 /* Determine name of the currently selected locale.
-   Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/macros.h b/lib/gltests/macros.h
index adb3744..77a92f8 100644
--- a/lib/gltests/macros.h
+++ b/lib/gltests/macros.h
@@ -1,5 +1,5 @@
 /* Common macros used by gnulib tests.
-   Copyright (C) 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 2006-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/malloc.c b/lib/gltests/malloc.c
index da45618..ffe042b 100644
--- a/lib/gltests/malloc.c
+++ b/lib/gltests/malloc.c
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/malloca.c b/lib/gltests/malloca.c
index ce071f1..3309088 100644
--- a/lib/gltests/malloca.c
+++ b/lib/gltests/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gltests/malloca.h b/lib/gltests/malloca.h
index 7083a58..725cc22 100644
--- a/lib/gltests/malloca.h
+++ b/lib/gltests/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2012 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib/gltests/putenv.c b/lib/gltests/putenv.c
index 2da3376..5f26b66 100644
--- a/lib/gltests/putenv.c
+++ b/lib/gltests/putenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2011 Free Software
+/* Copyright (C) 1991, 1994, 1997-1998, 2000, 2003-2012 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C
diff --git a/lib/gltests/setenv.c b/lib/gltests/setenv.c
index 0a5f67d..3854a99 100644
--- a/lib/gltests/setenv.c
+++ b/lib/gltests/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2011 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/gltests/setlocale.c b/lib/gltests/setlocale.c
index 0cef00f..caa1b87 100644
--- a/lib/gltests/setlocale.c
+++ b/lib/gltests/setlocale.c
@@ -1,5 +1,5 @@
 /* Set the current locale.
-   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/signature.h b/lib/gltests/signature.h
index 8256989..d9d8b47 100644
--- a/lib/gltests/signature.h
+++ b/lib/gltests/signature.h
@@ -1,5 +1,5 @@
 /* Macro for checking that a function declaration is compliant.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/stdlib.in.h b/lib/gltests/stdlib.in.h
index a59cb08..ea1c1c3 100644
--- a/lib/gltests/stdlib.in.h
+++ b/lib/gltests/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-alloca-opt.c b/lib/gltests/test-alloca-opt.c
index 5aa1645..4e814c6 100644
--- a/lib/gltests/test-alloca-opt.c
+++ b/lib/gltests/test-alloca-opt.c
@@ -1,5 +1,5 @@
 /* Test of optional automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-c-ctype.c b/lib/gltests/test-c-ctype.c
index 9d748ff..a9cb655 100644
--- a/lib/gltests/test-c-ctype.c
+++ b/lib/gltests/test-c-ctype.c
@@ -1,5 +1,5 @@
 /* Test of character handling in C locale.
-   Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-c-strcasecmp.c b/lib/gltests/test-c-strcasecmp.c
index faa3001..1eb5958 100644
--- a/lib/gltests/test-c-strcasecmp.c
+++ b/lib/gltests/test-c-strcasecmp.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-c-strncasecmp.c b/lib/gltests/test-c-strncasecmp.c
index 6a225c7..479528b 100644
--- a/lib/gltests/test-c-strncasecmp.c
+++ b/lib/gltests/test-c-strncasecmp.c
@@ -1,5 +1,5 @@
 /* Test of case-insensitive string comparison function.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-environ.c b/lib/gltests/test-environ.c
index 11df789..972ed06 100644
--- a/lib/gltests/test-environ.c
+++ b/lib/gltests/test-environ.c
@@ -1,5 +1,5 @@
 /* Test of environ variable.
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-iconv.c b/lib/gltests/test-iconv.c
index 0f46f42..333af2a 100644
--- a/lib/gltests/test-iconv.c
+++ b/lib/gltests/test-iconv.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-init.sh b/lib/gltests/test-init.sh
new file mode 100755
index 0000000..123da8e
--- /dev/null
+++ b/lib/gltests/test-init.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+# Unit tests for init.sh
+# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# This file is part of the GNUlib Library.
+#
+# 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
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+: ${srcdir=.}
+. "$srcdir/init.sh"; path_prepend_ .
+
+fail=0
+
+test_compare()
+{
+  touch empty || fail=1
+  echo xyz > in || fail=1
+
+  compare /dev/null /dev/null >out 2>err || fail=1
+  test -s out && fail_ "out not empty: $(cat out)"
+  # "err" should be empty, too, but has "set -x" output when VERBOSE=yes
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+
+  compare /dev/null empty >out 2>err || fail=1
+  test -s out && fail_ "out not empty: $(cat out)"
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+
+  compare in in >out 2>err || fail=1
+  test -s out && fail_ "out not empty: $(cat out)"
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+
+  compare /dev/null in >out 2>err && fail=1
+  cat <<\EOF > exp
+diff -u /dev/null in
+--- /dev/null	1970-01-01
++++ in	1970-01-01
++xyz
+EOF
+  compare exp out || fail=1
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+
+  compare empty in >out 2>err && fail=1
+  # Remove the TAB-date suffix on each --- and +++ line,
+  # for both the expected and the actual output files.
+  cat <<\EOF > exp
+--- empty
++++ in
+@@ -0,0 +1 @@
++xyz
+EOF
+  sed 's/	.*//' out > k && mv k out
+  compare exp out || fail=1
+  case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
+}
+
+test_compare
+
+Exit $fail
diff --git a/lib/gltests/test-intprops.c b/lib/gltests/test-intprops.c
index 1a34d77..aeb1168 100644
--- a/lib/gltests/test-intprops.c
+++ b/lib/gltests/test-intprops.c
@@ -1,5 +1,5 @@
 /* Test intprops.h.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-inttypes.c b/lib/gltests/test-inttypes.c
index 5bf952c..698d3dc 100644
--- a/lib/gltests/test-inttypes.c
+++ b/lib/gltests/test-inttypes.c
@@ -1,5 +1,5 @@
 /* Test of <inttypes.h> substitute.
-   Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007, 2009-2012 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
@@ -18,9 +18,6 @@
 
 #include <config.h>
 
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_FORMAT_MACROS 1 /* to make it work also in C++ mode */
 #include <inttypes.h>
 
 #include <stddef.h>
diff --git a/lib/gltests/test-locale.c b/lib/gltests/test-locale.c
index 9b55e37..1cd3dac 100644
--- a/lib/gltests/test-locale.c
+++ b/lib/gltests/test-locale.c
@@ -1,5 +1,5 @@
 /* Test of <locale.h> substitute.
-   Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-localename.c b/lib/gltests/test-localename.c
index 09f002c..f04c301 100644
--- a/lib/gltests/test-localename.c
+++ b/lib/gltests/test-localename.c
@@ -1,5 +1,5 @@
 /* Test of gl_locale_name function and its variants.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-lock.c b/lib/gltests/test-lock.c
index 3f8846b..15851da 100644
--- a/lib/gltests/test-lock.c
+++ b/lib/gltests/test-lock.c
@@ -1,5 +1,5 @@
 /* Test of locking in multithreaded situations.
-   Copyright (C) 2005, 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2008-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-malloca.c b/lib/gltests/test-malloca.c
index 92c86f2..d7732c3 100644
--- a/lib/gltests/test-malloca.c
+++ b/lib/gltests/test-malloca.c
@@ -1,5 +1,5 @@
 /* Test of safe automatic memory allocation.
-   Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-setenv.c b/lib/gltests/test-setenv.c
index 50eb71b..4752a11 100644
--- a/lib/gltests/test-setenv.c
+++ b/lib/gltests/test-setenv.c
@@ -1,5 +1,5 @@
 /* Tests of setenv.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-setlocale1.c b/lib/gltests/test-setlocale1.c
index ea7945c..08f9224 100644
--- a/lib/gltests/test-setlocale1.c
+++ b/lib/gltests/test-setlocale1.c
@@ -1,5 +1,5 @@
 /* Test of setting the current locale.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-setlocale2.c b/lib/gltests/test-setlocale2.c
index 7bfc42a..7416647 100644
--- a/lib/gltests/test-setlocale2.c
+++ b/lib/gltests/test-setlocale2.c
@@ -1,5 +1,5 @@
 /* Test of setting the current locale.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-stdbool.c b/lib/gltests/test-stdbool.c
index e115ba2..c22ca1f 100644
--- a/lib/gltests/test-stdbool.c
+++ b/lib/gltests/test-stdbool.c
@@ -1,5 +1,5 @@
 /* Test of <stdbool.h> substitute.
-   Copyright (C) 2002-2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2002-2007, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-stddef.c b/lib/gltests/test-stddef.c
index c929af8..d7237b3 100644
--- a/lib/gltests/test-stddef.c
+++ b/lib/gltests/test-stddef.c
@@ -1,5 +1,5 @@
 /* Test of <stddef.h> substitute.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-stdint.c b/lib/gltests/test-stdint.c
index f606cc3..23b2b28 100644
--- a/lib/gltests/test-stdint.c
+++ b/lib/gltests/test-stdint.c
@@ -1,5 +1,5 @@
 /* Test of <stdint.h> substitute.
-   Copyright (C) 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 2006-2012 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
@@ -21,8 +21,6 @@
 /* Whether to enable pedantic checks. */
 #define DO_PEDANTIC 0
 
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */
-#define __STDC_CONSTANT_MACROS 1 /* likewise */
 #include <stdint.h>
 
 #include "verify.h"
diff --git a/lib/gltests/test-stdlib.c b/lib/gltests/test-stdlib.c
index 210aab4..7eeb410 100644
--- a/lib/gltests/test-stdlib.c
+++ b/lib/gltests/test-stdlib.c
@@ -1,5 +1,5 @@
 /* Test of <stdlib.h> substitute.
-   Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-striconv.c b/lib/gltests/test-striconv.c
index 20cdd71..cd8d8ef 100644
--- a/lib/gltests/test-striconv.c
+++ b/lib/gltests/test-striconv.c
@@ -1,5 +1,5 @@
 /* Test of character set conversion.
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-strverscmp.c b/lib/gltests/test-strverscmp.c
index 9a9da10..d58cec2 100644
--- a/lib/gltests/test-strverscmp.c
+++ b/lib/gltests/test-strverscmp.c
@@ -1,5 +1,5 @@
 /* Test of strverscmp() function.
-   Copyright (C) 2008-2011 Free Software Foundation, Inc.
+   Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-sys_wait.h b/lib/gltests/test-sys_wait.h
index 3c9b322..d3726df 100644
--- a/lib/gltests/test-sys_wait.h
+++ b/lib/gltests/test-sys_wait.h
@@ -1,5 +1,5 @@
 /* Test of macros shared between <sys/wait.h> and <stdlib.h>.
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-thread_create.c b/lib/gltests/test-thread_create.c
index 1348c8c..8de098b 100644
--- a/lib/gltests/test-thread_create.c
+++ b/lib/gltests/test-thread_create.c
@@ -1,5 +1,5 @@
 /* Test of gl_thread_create () macro.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-thread_self.c b/lib/gltests/test-thread_self.c
index 816ee09..707f7fe 100644
--- a/lib/gltests/test-thread_self.c
+++ b/lib/gltests/test-thread_self.c
@@ -1,5 +1,5 @@
 /* Test of gl_thread_self () macro.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-unistd.c b/lib/gltests/test-unistd.c
index be1ae06..e53fd7a 100644
--- a/lib/gltests/test-unistd.c
+++ b/lib/gltests/test-unistd.c
@@ -1,5 +1,5 @@
 /* Test of <unistd.h> substitute.
-   Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-unsetenv.c b/lib/gltests/test-unsetenv.c
index 9c9443b..926526d 100644
--- a/lib/gltests/test-unsetenv.c
+++ b/lib/gltests/test-unsetenv.c
@@ -1,5 +1,5 @@
 /* Tests of unsetenv.
-   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/test-verify.c b/lib/gltests/test-verify.c
index 454f4f4..5ab9c58 100644
--- a/lib/gltests/test-verify.c
+++ b/lib/gltests/test-verify.c
@@ -1,6 +1,6 @@
 /* Test the "verify" module.
 
-   Copyright (C) 2005, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/unistd.in.h b/lib/gltests/unistd.in.h
index 77e5675..6aac9c3 100644
--- a/lib/gltests/unistd.in.h
+++ b/lib/gltests/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2011 Free Software Foundation, Inc.
+   Copyright (C) 2003-2012 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
@@ -935,6 +935,27 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - "
 #endif
 
 
+#if @GNULIB_ISATTY@
+# if @REPLACE_ISATTY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef isatty
+#   define isatty rpl_isatty
+#  endif
+_GL_FUNCDECL_RPL (isatty, int, (int fd));
+_GL_CXXALIAS_RPL (isatty, int, (int fd));
+# else
+_GL_CXXALIAS_SYS (isatty, int, (int fd));
+# endif
+_GL_CXXALIASWARN (isatty);
+#elif defined GNULIB_POSIXCHECK
+# undef isatty
+# if HAVE_RAW_DECL_ISATTY
+_GL_WARN_ON_USE (isatty, "isatty has portability problems on native Windows - "
+                 "use gnulib module isatty for portability");
+# endif
+#endif
+
+
 #if @GNULIB_LCHOWN@
 /* Change the owner of FILE to UID (if UID is not -1) and the group of FILE
    to GID (if GID is not -1).  Do not follow symbolic links.
@@ -1268,6 +1289,33 @@ _GL_WARN_ON_USE (rmdir, "rmdir is unportable - "
 #endif
 
 
+#if @GNULIB_SETHOSTNAME@
+/* Set the host name of the machine.
+   The host name may or may not be fully qualified.
+
+   Put LEN bytes of NAME into the host name.
+   Return 0 if successful, otherwise, set errno and return -1.
+
+   Platforms with no ability to set the hostname return -1 and set
+   errno = ENOSYS.  */
+# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
+_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
+                                    _GL_ARG_NONNULL ((1)));
+# endif
+/* Need to cast, because on Solaris 11 2011-10, MacOS X 10.5, IRIX 6.5
+   and FreeBSD 6.4 the second parameter is int.  On Solaris 11
+   2011-10, the first parameter is not const.  */
+_GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
+_GL_CXXALIASWARN (sethostname);
+#elif defined GNULIB_POSIXCHECK
+# undef sethostname
+# if HAVE_RAW_DECL_SETHOSTNAME
+_GL_WARN_ON_USE (sethostname, "sethostname is unportable - "
+                 "use gnulib module sethostname for portability");
+# endif
+#endif
+
+
 #if @GNULIB_SLEEP@
 /* Pause the execution of the current thread for N seconds.
    Returns the number of seconds left to sleep.
diff --git a/lib/gltests/unistr/test-u8-mbtoucr.c b/lib/gltests/unistr/test-u8-mbtoucr.c
index 092af56..9e38885 100644
--- a/lib/gltests/unistr/test-u8-mbtoucr.c
+++ b/lib/gltests/unistr/test-u8-mbtoucr.c
@@ -1,5 +1,5 @@
 /* Test of u8_mbtoucr() function.
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/unistr/test-u8-uctomb.c b/lib/gltests/unistr/test-u8-uctomb.c
index 01e6b4e..988808e 100644
--- a/lib/gltests/unistr/test-u8-uctomb.c
+++ b/lib/gltests/unistr/test-u8-uctomb.c
@@ -1,5 +1,5 @@
 /* Test of u8_uctomb() function.
-   Copyright (C) 2010-2011 Free Software Foundation, Inc.
+   Copyright (C) 2010-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/unsetenv.c b/lib/gltests/unsetenv.c
index 16b50d1..b1e659b 100644
--- a/lib/gltests/unsetenv.c
+++ b/lib/gltests/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2011 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/lib/gltests/verify.h b/lib/gltests/verify.h
index 9a8caad..e9d6666 100644
--- a/lib/gltests/verify.h
+++ b/lib/gltests/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2011 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/gltests/wchar.in.h b/lib/gltests/wchar.in.h
index 1ed4521..86c97ff 100644
--- a/lib/gltests/wchar.in.h
+++ b/lib/gltests/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2011 Free Software Foundation, Inc.
+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/idn-free.c b/lib/idn-free.c
index b19992b..862e0ea 100644
--- a/lib/idn-free.c
+++ b/lib/idn-free.c
@@ -1,7 +1,6 @@
 /* idn-free.c --- Invoke the `free' function releasing memory
  *                allocated by libidn functions.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/idn-free.h b/lib/idn-free.h
index 90f5d1b..2abe494 100644
--- a/lib/idn-free.h
+++ b/lib/idn-free.h
@@ -1,7 +1,6 @@
 /* idn-free.h --- Invoke the `free' function releasing memory
  *                allocated by libidn functions.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/idna.c b/lib/idna.c
index e875d3e..3d76630 100644
--- a/lib/idna.c
+++ b/lib/idna.c
@@ -1,6 +1,5 @@
 /* idna.c --- Convert to or from IDN strings.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- * Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/idna.h b/lib/idna.h
index 025c3da..98c43bb 100644
--- a/lib/idna.h
+++ b/lib/idna.h
@@ -1,6 +1,5 @@
 /* idna.h --- Declarations for Internationalized Domain Name in Applications.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/libidn.map b/lib/libidn.map
index ef74232..34efd2f 100644
--- a/lib/libidn.map
+++ b/lib/libidn.map
@@ -1,4 +1,4 @@
-# Copyright (C) 2009, 2010, 2011 Simon Josefsson.
+# Copyright (C) 2009-2012 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/lib/nfkc.c b/lib/nfkc.c
index 9004bda..45ce569 100644
--- a/lib/nfkc.c
+++ b/lib/nfkc.c
@@ -1,6 +1,5 @@
 /* nfkc.c --- Unicode normalization utilities.
- * Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011
- * Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
@@ -21,7 +20,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -29,13 +28,6 @@
 
 #include "stringprep.h"
 
-/* This file contains functions from GLIB, including gutf8.c and
- * gunidecomp.c, all licensed under LGPL and copyright hold by:
- *
- *  Copyright (C) 1999, 2000 Tom Tromey
- *  Copyright 2000 Red Hat, Inc.
- */
-
 /* Hacks to make syncing with GLIB code easier. */
 #define gboolean int
 #define gchar char
@@ -51,27 +43,67 @@
 #define gssize ssize_t
 #define g_malloc malloc
 #define g_free free
-#define g_new(struct_type, n_structs)					\
-  ((struct_type *) g_malloc (((gsize) sizeof (struct_type)) * ((gsize) (n_structs))))
-#  if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus)
-#    define G_STMT_START	(void)(
-#    define G_STMT_END		)
-#  else
-#    if (defined (sun) || defined (__sun__))
-#      define G_STMT_START	if (1)
-#      define G_STMT_END	else (void)0
-#    else
-#      define G_STMT_START	do
-#      define G_STMT_END	while (0)
-#    endif
-#  endif
-#define g_return_val_if_fail(expr,val)		G_STMT_START{ (void)0; }G_STMT_END
+#define g_return_val_if_fail(expr,val)	{		\
+    if (!(expr))					\
+      return (val);					\
+  }
+
+/* Code from GLIB gmacros.h starts here. */
+
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef	FALSE
+#define	FALSE	(0)
+#endif
+
+#ifndef	TRUE
+#define	TRUE	(!FALSE)
+#endif
+
 #define G_N_ELEMENTS(arr)		(sizeof (arr) / sizeof ((arr)[0]))
-#define TRUE 1
-#define FALSE 0
+
+#define G_UNLIKELY(expr) (expr)
 
 /* Code from GLIB gunicode.h starts here. */
 
+/* gunicode.h - Unicode manipulation functions
+ *
+ *  Copyright (C) 1999, 2000 Tom Tromey
+ *  Copyright 2000, 2005 Red Hat, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *   Boston, MA 02111-1307, USA.
+ */
+
 typedef enum
 {
   G_NORMALIZE_DEFAULT,
@@ -85,8 +117,31 @@ typedef enum
 }
 GNormalizeMode;
 
+#define g_utf8_next_char(p) ((p) + g_utf8_skip[*(const guchar *)(p)])
+
 /* Code from GLIB gutf8.c starts here. */
 
+/* gutf8.c - Operations on UTF-8 strings.
+ *
+ * Copyright (C) 1999 Tom Tromey
+ * Copyright (C) 2000 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
 #define UTF8_COMPUTE(Char, Mask, Len)		\
   if (Char < 128)				\
     {						\
@@ -128,18 +183,17 @@ GNormalizeMode;
      ((Char) < 0x200000 ? 4 :			\
       ((Char) < 0x4000000 ? 5 : 6)))))
 
-
-#define UTF8_GET(Result, Chars, Count, Mask, Len)	\
-  (Result) = (Chars)[0] & (Mask);			\
-  for ((Count) = 1; (Count) < (Len); ++(Count))		\
-    {							\
-      if (((Chars)[(Count)] & 0xc0) != 0x80)		\
-	{						\
-	  (Result) = -1;				\
-	  break;					\
-	}						\
-      (Result) <<= 6;					\
-      (Result) |= ((Chars)[(Count)] & 0x3f);		\
+#define UTF8_GET(Result, Chars, Count, Mask, Len)			      \
+  (Result) = (Chars)[0] & (Mask);					      \
+  for ((Count) = 1; (Count) < (Len); ++(Count))				      \
+    {									      \
+      if (((Chars)[(Count)] & 0xc0) != 0x80)				      \
+	{								      \
+	  (Result) = -1;						      \
+	  break;							      \
+	}								      \
+      (Result) <<= 6;							      \
+      (Result) |= ((Chars)[(Count)] & 0x3f);				      \
     }
 
 static const gchar utf8_skip_data[256] = {
@@ -161,19 +215,18 @@ static const gchar utf8_skip_data[256] = {
   5, 5, 5, 6, 6, 1, 1
 };
 
-static const gchar *const g_utf8_skip = utf8_skip_data;
-
-#define g_utf8_next_char(p) ((p) + g_utf8_skip[*(const guchar *)(p)])
+const gchar *const g_utf8_skip = utf8_skip_data;
 
 /*
  * g_utf8_strlen:
- * @p: pointer to the start of a UTF-8 encoded string.
+ * @p: pointer to the start of a UTF-8 encoded string
  * @max: the maximum number of bytes to examine. If @max
  *       is less than 0, then the string is assumed to be
  *       nul-terminated. If @max is 0, @p will not be examined and
  *       may be %NULL.
  *
- * Returns the length of the string in characters.
+ * Computes the length of the string in characters, not including
+ * the terminating nul character.
  *
  * Return value: the length of the string in characters
  **/
@@ -208,7 +261,7 @@ g_utf8_strlen (const gchar * p, gssize max)
       /* only do the last len increment if we got a complete
        * char (don't count partial chars)
        */
-      if (p - start == max)
+      if (p - start <= max)
 	++len;
     }
 
@@ -244,7 +297,7 @@ g_utf8_get_char (const gchar * p)
 
 /*
  * g_unichar_to_utf8:
- * @c: a ISO10646 character code
+ * @c: a Unicode character code
  * @outbuf: output buffer, must have at least 6 bytes of space.
  *       If %NULL, the length will be computed and returned
  *       and nothing will be written to @outbuf.
@@ -256,8 +309,10 @@ g_utf8_get_char (const gchar * p)
 static int
 g_unichar_to_utf8 (gunichar c, gchar * outbuf)
 {
+  /* If this gets modified, also update the copy in g_string_insert_unichar() */
   guint len = 0;
   int first;
+  int i;
 
   if (c < 0x80)
     {
@@ -292,7 +347,6 @@ g_unichar_to_utf8 (gunichar c, gchar * outbuf)
 
   if (outbuf)
     {
-      guint i;
       for (i = len - 1; i > 0; --i)
 	{
 	  outbuf[i] = (c & 0x3f) | 0x80;
@@ -307,15 +361,16 @@ g_unichar_to_utf8 (gunichar c, gchar * outbuf)
 /*
  * g_utf8_to_ucs4_fast:
  * @str: a UTF-8 encoded string
- * @len: the maximum length of @str to use. If @len < 0, then
- *       the string is nul-terminated.
+ * @len: the maximum length of @str to use, in bytes. If @len < 0,
+ *       then the string is nul-terminated.
  * @items_written: location to store the number of characters in the
  *                 result, or %NULL.
  *
  * Convert a string from UTF-8 to a 32-bit fixed width
  * representation as UCS-4, assuming valid UTF-8 input.
  * This function is roughly twice as fast as g_utf8_to_ucs4()
- * but does no error checking on the input.
+ * but does no error checking on the input. A trailing 0 character
+ * will be added to the string after the converted text.
  *
  * Return value: a pointer to a newly allocated UCS-4 string.
  *               This value must be freed with g_free().
@@ -323,9 +378,8 @@ g_unichar_to_utf8 (gunichar c, gchar * outbuf)
 static gunichar *
 g_utf8_to_ucs4_fast (const gchar * str, glong len, glong * items_written)
 {
-  gint j, charlen;
   gunichar *result;
-  gint n_chars, i;
+  gsize n_chars, i;
   const gchar *p;
 
   g_return_val_if_fail (str != NULL, NULL);
@@ -349,56 +403,44 @@ g_utf8_to_ucs4_fast (const gchar * str, glong len, glong * items_written)
 	}
     }
 
-  result = g_new (gunichar, n_chars + 1);
+  result = g_malloc (sizeof (gunichar) * (n_chars + 1));
   if (!result)
     return NULL;
 
   p = str;
   for (i = 0; i < n_chars; i++)
     {
-      gunichar wc = ((const unsigned char *) p)[0];
+      gunichar wc = (guchar) * p++;
 
       if (wc < 0x80)
 	{
 	  result[i] = wc;
-	  p++;
 	}
       else
 	{
-	  if (wc < 0xe0)
-	    {
-	      charlen = 2;
-	      wc &= 0x1f;
-	    }
-	  else if (wc < 0xf0)
-	    {
-	      charlen = 3;
-	      wc &= 0x0f;
-	    }
-	  else if (wc < 0xf8)
-	    {
-	      charlen = 4;
-	      wc &= 0x07;
-	    }
-	  else if (wc < 0xfc)
-	    {
-	      charlen = 5;
-	      wc &= 0x03;
-	    }
-	  else
+	  gunichar mask = 0x40;
+
+	  if (G_UNLIKELY ((wc & mask) == 0))
 	    {
-	      charlen = 6;
-	      wc &= 0x01;
+	      /* It's an out-of-sequence 10xxxxxxx byte.
+	       * Rather than making an ugly hash of this and the next byte
+	       * and overrunning the buffer, it's more useful to treat it
+	       * with a replacement character */
+	      result[i] = 0xfffd;
+	      continue;
 	    }
 
-	  for (j = 1; j < charlen; j++)
+	  do
 	    {
 	      wc <<= 6;
-	      wc |= ((const unsigned char *) p)[j] & 0x3f;
+	      wc |= (guchar) (*p++) & 0x3f;
+	      mask <<= 5;
 	    }
+	  while ((wc & mask) != 0);
+
+	  wc &= mask - 1;
 
 	  result[i] = wc;
-	  p += charlen;
 	}
     }
   result[i] = 0;
@@ -412,13 +454,13 @@ g_utf8_to_ucs4_fast (const gchar * str, glong len, glong * items_written)
 /*
  * g_ucs4_to_utf8:
  * @str: a UCS-4 encoded string
- * @len: the maximum length of @str to use. If @len < 0, then
- *       the string is terminated with a 0 character.
- * @items_read: location to store number of characters read read, or %NULL.
+ * @len: the maximum length (number of characters) of @str to use.
+ *       If @len < 0, then the string is nul-terminated.
+ * @items_read: location to store number of characters read, or %NULL.
  * @items_written: location to store number of bytes written or %NULL.
  *                 The value here stored does not include the trailing 0
  *                 byte.
- * @error: location to store the error occuring, or %NULL to ignore
+ * @error: location to store the error occurring, or %NULL to ignore
  *         errors. Any of the errors in #GConvertError other than
  *         %G_CONVERT_ERROR_NO_CONVERSION may occur.
  *
@@ -428,7 +470,9 @@ g_utf8_to_ucs4_fast (const gchar * str, glong len, glong * items_written)
  * Return value: a pointer to a newly allocated UTF-8 string.
  *               This value must be freed with g_free(). If an
  *               error occurs, %NULL will be returned and
- *               @error set.
+ *               @error set. In that case, @items_read will be
+ *               set to the position of the first invalid input
+ *               character.
  **/
 static gchar *
 g_ucs4_to_utf8 (const gunichar * str,
@@ -447,12 +491,7 @@ g_ucs4_to_utf8 (const gunichar * str,
 	break;
 
       if (str[i] >= 0x80000000)
-	{
-	  if (items_read)
-	    *items_read = i;
-
-	  goto err_out;
-	}
+	goto err_out;
 
       result_length += UTF8_LENGTH (str[i]);
     }
@@ -480,24 +519,45 @@ err_out:
 
 /* Code from GLIB gunidecomp.c starts here. */
 
+/* decomp.c - Character decomposition.
+ *
+ *  Copyright (C) 1999, 2000 Tom Tromey
+ *  Copyright 2000 Red Hat, Inc.
+ *
+ * The Gnome Library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * The Gnome Library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the Gnome Library; see the file COPYING.LIB.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *   Boston, MA 02111-1307, USA.
+ */
+
 #include "gunidecomp.h"
 #include "gunicomp.h"
 
-#define CC_PART1(Page, Char) \
-  ((combining_class_table_part1[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
-   ? (combining_class_table_part1[Page] - G_UNICODE_MAX_TABLE_INDEX) \
+#define CC_PART1(Page, Char)						\
+  ((combining_class_table_part1[Page] >= G_UNICODE_MAX_TABLE_INDEX)	\
+   ? (combining_class_table_part1[Page] - G_UNICODE_MAX_TABLE_INDEX)	\
    : (cclass_data[combining_class_table_part1[Page]][Char]))
 
-#define CC_PART2(Page, Char) \
-  ((combining_class_table_part2[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
-   ? (combining_class_table_part2[Page] - G_UNICODE_MAX_TABLE_INDEX) \
+#define CC_PART2(Page, Char)						\
+  ((combining_class_table_part2[Page] >= G_UNICODE_MAX_TABLE_INDEX)	\
+   ? (combining_class_table_part2[Page] - G_UNICODE_MAX_TABLE_INDEX)	\
    : (cclass_data[combining_class_table_part2[Page]][Char]))
 
-#define COMBINING_CLASS(Char) \
-  (((Char) <= G_UNICODE_LAST_CHAR_PART1) \
-   ? CC_PART1 ((Char) >> 8, (Char) & 0xff) \
-   : (((Char) >= 0xe0000 && (Char) <= G_UNICODE_LAST_CHAR) \
-      ? CC_PART2 (((Char) - 0xe0000) >> 8, (Char) & 0xff) \
+#define COMBINING_CLASS(Char)					\
+  (((Char) <= G_UNICODE_LAST_CHAR_PART1)			\
+   ? CC_PART1 ((Char) >> 8, (Char) & 0xff)			\
+   : (((Char) >= 0xe0000 && (Char) <= G_UNICODE_LAST_CHAR)	\
+      ? CC_PART2 (((Char) - 0xe0000) >> 8, (Char) & 0xff)	\
       : 0))
 
 /* constants for hangul syllable [de]composition */
@@ -566,35 +626,22 @@ static void
 decompose_hangul (gunichar s, gunichar * r, gsize * result_len)
 {
   gint SIndex = s - SBase;
+  gint TIndex = SIndex % TCount;
 
-  /* not a hangul syllable */
-  if (SIndex < 0 || SIndex >= SCount)
+  if (r)
     {
-      if (r)
-	r[0] = s;
-      *result_len = 1;
+      r[0] = LBase + SIndex / NCount;
+      r[1] = VBase + (SIndex % NCount) / TCount;
     }
-  else
-    {
-      gunichar L = LBase + SIndex / NCount;
-      gunichar V = VBase + (SIndex % NCount) / TCount;
-      gunichar T = TBase + SIndex % TCount;
 
+  if (TIndex)
+    {
       if (r)
-	{
-	  r[0] = L;
-	  r[1] = V;
-	}
-
-      if (T != TBase)
-	{
-	  if (r)
-	    r[2] = T;
-	  *result_len = 3;
-	}
-      else
-	*result_len = 2;
+	r[2] = TBase + TIndex;
+      *result_len = 3;
     }
+  else
+    *result_len = 2;
 }
 
 /* returns a pointer to a null-terminated UTF-8 string */
@@ -656,7 +703,7 @@ combine_hangul (gunichar a, gunichar b, gunichar * result)
       return TRUE;
     }
   else if (0 <= SIndex && SIndex < SCount && (SIndex % TCount) == 0
-	   && 0 <= TIndex && TIndex <= TCount)
+	   && 0 < TIndex && TIndex < TCount)
     {
       *result = a + TIndex;
       return TRUE;
@@ -665,13 +712,13 @@ combine_hangul (gunichar a, gunichar b, gunichar * result)
   return FALSE;
 }
 
-#define CI(Page, Char) \
-  ((compose_table[Page] >= G_UNICODE_MAX_TABLE_INDEX) \
-   ? (compose_table[Page] - G_UNICODE_MAX_TABLE_INDEX) \
+#define CI(Page, Char)					\
+  ((compose_table[Page] >= G_UNICODE_MAX_TABLE_INDEX)	\
+   ? (compose_table[Page] - G_UNICODE_MAX_TABLE_INDEX)	\
    : (compose_data[compose_table[Page]][Char]))
 
-#define COMPOSE_INDEX(Char) \
-     ((((Char) >> 8) > (COMPOSE_TABLE_LAST)) ? 0 : CI((Char) >> 8, (Char) & 0xff))
+#define COMPOSE_INDEX(Char)						\
+  (((Char >> 8) > (COMPOSE_TABLE_LAST)) ? 0 : CI((Char) >> 8, (Char) & 0xff))
 
 static gboolean
 combine (gunichar a, gunichar b, gunichar * result)
@@ -745,7 +792,7 @@ _g_utf8_normalize_wc (const gchar * str, gssize max_len, GNormalizeMode mode)
       const gchar *decomp;
       gunichar wc = g_utf8_get_char (p);
 
-      if (wc >= 0xac00 && wc <= 0xd7af)
+      if (wc >= SBase && wc < SBase + SCount)
 	{
 	  gsize result_len;
 	  decompose_hangul (wc, NULL, &result_len);
@@ -764,7 +811,7 @@ _g_utf8_normalize_wc (const gchar * str, gssize max_len, GNormalizeMode mode)
       p = g_utf8_next_char (p);
     }
 
-  wc_buffer = g_new (gunichar, n_wc + 1);
+  wc_buffer = g_malloc (sizeof (gunichar) * (n_wc + 1));
   if (!wc_buffer)
     return NULL;
 
@@ -778,7 +825,7 @@ _g_utf8_normalize_wc (const gchar * str, gssize max_len, GNormalizeMode mode)
       int cc;
       gsize old_n_wc = n_wc;
 
-      if (wc >= 0xac00 && wc <= 0xd7af)
+      if (wc >= SBase && wc < SBase + SCount)
 	{
 	  gsize result_len;
 	  decompose_hangul (wc, wc_buffer + n_wc, &result_len);
@@ -814,8 +861,11 @@ _g_utf8_normalize_wc (const gchar * str, gssize max_len, GNormalizeMode mode)
     }
 
   if (n_wc > 0)
-    g_unicode_canonical_ordering (wc_buffer + last_start,
-				  n_wc - last_start);
+    {
+      g_unicode_canonical_ordering (wc_buffer + last_start,
+				    n_wc - last_start);
+      last_start = n_wc;
+    }
 
   wc_buffer[n_wc] = 0;
 
@@ -870,9 +920,10 @@ _g_utf8_normalize_wc (const gchar * str, gssize max_len, GNormalizeMode mode)
  * Converts a string into canonical form, standardizing
  * such issues as whether a character with an accent
  * is represented as a base character and combining
- * accent or as a single precomposed character. You
- * should generally call g_utf8_normalize() before
- * comparing two Unicode strings.
+ * accent or as a single precomposed character. The
+ * string has to be valid UTF-8, otherwise %NULL is
+ * returned. You should generally call g_utf8_normalize()
+ * before comparing two Unicode strings.
  *
  * The normalization mode %G_NORMALIZE_DEFAULT only
  * standardizes differences that do not affect the
@@ -883,8 +934,6 @@ _g_utf8_normalize_wc (const gchar * str, gssize max_len, GNormalizeMode mode)
  * (in this case DIGIT THREE). Formatting information
  * may be lost but for most text operations such
  * characters should be considered the same.
- * For example, g_utf8_collate() normalizes
- * with %G_NORMALIZE_ALL as its first step.
  *
  * %G_NORMALIZE_DEFAULT_COMPOSE and %G_NORMALIZE_ALL_COMPOSE
  * are like %G_NORMALIZE_DEFAULT and %G_NORMALIZE_ALL,
@@ -895,7 +944,8 @@ _g_utf8_normalize_wc (const gchar * str, gssize max_len, GNormalizeMode mode)
  * less capable Unicode handling.
  *
  * Return value: a newly allocated string, that is the
- *   normalized form of @str.
+ *   normalized form of @str, or %NULL if @str is not
+ *   valid UTF-8.
  **/
 static gchar *
 g_utf8_normalize (const gchar * str, gssize len, GNormalizeMode mode)
diff --git a/lib/pr29.c b/lib/pr29.c
index 88919cb..98087c3 100644
--- a/lib/pr29.c
+++ b/lib/pr29.c
@@ -1,6 +1,5 @@
 /* pr29.h --- Detect strings that are non-idempotent under NFKC in Unicode 3.2.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson.
+ * Copyright (C) 2004-2012 Simon Josefsson.
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/pr29.h b/lib/pr29.h
index c6b8d20..69f129d 100644
--- a/lib/pr29.h
+++ b/lib/pr29.h
@@ -1,6 +1,5 @@
 /* pr29.h --- Detect strings which are non-idempotent under NFKC.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson.
+ * Copyright (C) 2004-2012 Simon Josefsson.
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/profiles.c b/lib/profiles.c
index 336b6c7..a4290d7 100644
--- a/lib/profiles.c
+++ b/lib/profiles.c
@@ -1,6 +1,5 @@
 /* profiles.c --- Definitions of stringprep profiles.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/punycode.c b/lib/punycode.c
index c554cad..6e58b2a 100644
--- a/lib/punycode.c
+++ b/lib/punycode.c
@@ -1,6 +1,5 @@
 /* punycode.c --- Implementation of punycode used to ASCII encode IDN's.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/punycode.h b/lib/punycode.h
index 64d570f..c350d7e 100644
--- a/lib/punycode.h
+++ b/lib/punycode.h
@@ -1,6 +1,5 @@
 /* punycode.h --- Declarations for punycode functions.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/strerror-idna.c b/lib/strerror-idna.c
index 9e53d4f..9660886 100644
--- a/lib/strerror-idna.c
+++ b/lib/strerror-idna.c
@@ -1,6 +1,5 @@
 /* strerror-idna.c --- Convert IDNA errors into text.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/strerror-pr29.c b/lib/strerror-pr29.c
index 6798905..4c03c72 100644
--- a/lib/strerror-pr29.c
+++ b/lib/strerror-pr29.c
@@ -1,6 +1,5 @@
 /* strerror-pr29.c --- Convert PR29 errors into text.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/strerror-punycode.c b/lib/strerror-punycode.c
index 7ab6656..a3b56c1 100644
--- a/lib/strerror-punycode.c
+++ b/lib/strerror-punycode.c
@@ -1,6 +1,5 @@
 /* strerror-punycode.c --- Convert punycode errors into text.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/strerror-stringprep.c b/lib/strerror-stringprep.c
index 3e58245..db4df94 100644
--- a/lib/strerror-stringprep.c
+++ b/lib/strerror-stringprep.c
@@ -1,6 +1,5 @@
 /* strerror-stringprep.c --- Convert stringprep errors into text.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/strerror-tld.c b/lib/strerror-tld.c
index 75289f9..1b7133e 100644
--- a/lib/strerror-tld.c
+++ b/lib/strerror-tld.c
@@ -1,6 +1,5 @@
 /* strerror-tld.c --- Convert TLD errors into text.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/stringprep.c b/lib/stringprep.c
index 15be036..6199c9b 100644
--- a/lib/stringprep.c
+++ b/lib/stringprep.c
@@ -1,6 +1,5 @@
 /* stringprep.c --- Core stringprep implementation.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/stringprep.h b/lib/stringprep.h
index 50ccdcb..dddd262 100644
--- a/lib/stringprep.h
+++ b/lib/stringprep.h
@@ -1,6 +1,5 @@
 /* stringprep.h --- Header file for stringprep functions.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/tld.c b/lib/tld.c
index f514e81..69817ac 100644
--- a/lib/tld.c
+++ b/lib/tld.c
@@ -1,7 +1,6 @@
 /* tld.c --- Handle TLD restriction checking.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson.
- * Copyright (C) 2003, 2004, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2004-2012 Simon Josefsson.
+ * Copyright (C) 2003-2012 Free Software Foundation, Inc.
  *
  * Author: Thomas Jacob, Internet24.de
  *
diff --git a/lib/tld.h b/lib/tld.h
index cac1884..9d00602 100644
--- a/lib/tld.h
+++ b/lib/tld.h
@@ -1,7 +1,6 @@
 /* tld.h --- Declarations for TLD restriction checking.
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson.
- * Copyright (C) 2003, 2004, 2010, 2011 Free Software Foundation, Inc.
+ * Copyright (C) 2004-2012 Simon Josefsson.
+ * Copyright (C) 2003-2012 Free Software Foundation, Inc.
  *
  * Author: Thomas Jacob, Internet24.de
  *
diff --git a/lib/toutf8.c b/lib/toutf8.c
index 42027e4..aabaaf2 100644
--- a/lib/toutf8.c
+++ b/lib/toutf8.c
@@ -1,6 +1,5 @@
 /* toutf8.c --- Convert strings from system locale into UTF-8.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/lib/version.c b/lib/version.c
index d08549d..bb823ff 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -1,6 +1,5 @@
 /* version.c --- Version handling.
- * Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011
- * Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/libc/README b/libc/README
index 0515be2..725bd10 100644
--- a/libc/README
+++ b/libc/README
@@ -1,6 +1,5 @@
 Libidn libc/README -- Instructions for building as a GNU Libc add-on.
-Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-Josefsson
+Copyright (C) 2003-2012 Simon Josefsson
 See the end for copying conditions.
 
 GNU Libidn is now part of GNU Libc, so the stand-alone patch and
diff --git a/libc/example.c b/libc/example.c
index 24fab5f..3c0a255 100644
--- a/libc/example.c
+++ b/libc/example.c
@@ -1,5 +1,5 @@
 /* example.c --- Example code showing how to use IDN enabled getaddrinfo().
- * Copyright (C) 2003, 2004, 2010, 2011 Simon Josefsson
+ * Copyright (C) 2003-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/libc/getaddrinfo-idn.txt b/libc/getaddrinfo-idn.txt
index 004aeaa..60f2fc1 100644
--- a/libc/getaddrinfo-idn.txt
+++ b/libc/getaddrinfo-idn.txt
@@ -1,5 +1,5 @@
 Libidn getaddrinfo-idn.txt -- Proposal for IDN support in POSIX getaddrinfo.
-Copyright (C) 2003, 2004, 2010, 2011 Simon Josefsson
+Copyright (C) 2003-2012 Simon Josefsson
 See the end for copying conditions.
 
 Background
diff --git a/libidn.pc.in b/libidn.pc.in
index 50ad3ca..a69d5d3 100644
--- a/libidn.pc.in
+++ b/libidn.pc.in
@@ -1,6 +1,5 @@
 # Process this file with autoconf to produce a pkg-config metadata file.
-# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-# Simon Josefsson
+# Copyright 2002-2012 Simon Josefsson
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
diff --git a/maint.mk b/maint.mk
index e4efb5f..8a1e635 100644
--- a/maint.mk
+++ b/maint.mk
@@ -2,7 +2,7 @@
 # This Makefile fragment tries to be general-purpose enough to be
 # used by many projects via the gnulib maintainer-makefile module.
 
-## Copyright (C) 2001-2011 Free Software Foundation, Inc.
+## Copyright (C) 2001-2012 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
@@ -221,15 +221,6 @@ define _sc_say_and_exit
    { printf '%s\n' "$(ME): $$msg" 1>&2; exit 1; };
 endef
 
-# _sc_search_regexp used to be named _prohibit_regexp.  However,
-# upgrading to the new definition and leaving the old name undefined
-# would usually convert each custom rule using $(_prohibit_regexp)
-# (usually defined in cfg.mk) into a no-op.  This definition ensures
-# that people know right away if they're still using the old name.
-# FIXME: remove in 2012.
-_prohibit_regexp = \
-  $(error '*** you need to s/_prohibit_regexp/_sc_search_regexp/, and adapt')
-
 define _sc_search_regexp
    dummy=; : so we do not need a semicolon before each use;		\
 									\
diff --git a/po/it.po.in b/po/it.po.in
index ba3f717..a49a0ad 100644
--- a/po/it.po.in
+++ b/po/it.po.in
@@ -1,162 +1,149 @@
 # Italian messages for libidn.
 # Copyright (C) 2004, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the libidn package.
-# Marco Colombo <m.colombo@ed.ac.uk>, 2004, 2007, 2008.
+# Marco Colombo <m.colombo@ed.ac.uk>, 2004, 2007, 2008, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: libidn 1.9\n"
+"Project-Id-Version: libidn 1.21\n"
 "Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
-"POT-Creation-Date: 2008-07-01 18:15+0200\n"
-"PO-Revision-Date: 2008-07-07 10:57+0100\n"
+"POT-Creation-Date: 2011-04-24 17:12+0200\n"
+"PO-Revision-Date: 2011-12-05 17:30+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:58 lib/strerror-punycode.c:58
-#: lib/strerror-stringprep.c:78 lib/strerror-tld.c:60
+#: lib/strerror-idna.c:75 lib/strerror-pr29.c:59 lib/strerror-punycode.c:59
+#: lib/strerror-stringprep.c:79 lib/strerror-tld.c:61
 msgid "Success"
 msgstr "Successo"
 
-#: lib/strerror-idna.c:78 lib/strerror-pr29.c:66
+#: lib/strerror-idna.c:79 lib/strerror-pr29.c:67
 msgid "String preparation failed"
 msgstr "Preparazione della stringa non riuscita"
 
-#: lib/strerror-idna.c:82
+#: lib/strerror-idna.c:83
 msgid "Punycode failed"
 msgstr "Punycode non riuscito"
 
-#: lib/strerror-idna.c:86
+#: lib/strerror-idna.c:87
 msgid "Non-digit/letter/hyphen in input"
 msgstr "Non-numero/lettera/trattino nell'input"
 
-#: lib/strerror-idna.c:90
+#: lib/strerror-idna.c:91
 msgid "Forbidden leading or trailing minus sign (`-')"
 msgstr "Segno meno (\"-\") iniziale o finale proibito"
 
-#: lib/strerror-idna.c:94
+#: lib/strerror-idna.c:95
 msgid "Output would be too large or too small"
 msgstr "L'output sarebbe troppo grande o troppo piccolo"
 
-#: lib/strerror-idna.c:98
+#: lib/strerror-idna.c:99
 msgid "Input does not start with ACE prefix (`xn--')"
 msgstr "L'input non comincia con il prefisso ACE (\"xn--\")"
 
-#: lib/strerror-idna.c:102
+#: lib/strerror-idna.c:103
 msgid "String not idempotent under ToASCII"
 msgstr "La stringa non è idempotente per ToASCII"
 
-#: lib/strerror-idna.c:106
+#: lib/strerror-idna.c:107
 msgid "Input already contain ACE prefix (`xn--')"
 msgstr "L'input contiene già il prefisso ACE (\"xn--\")"
 
-#: lib/strerror-idna.c:110 lib/strerror-tld.c:76
+#: lib/strerror-idna.c:111 lib/strerror-tld.c:77
 msgid "System iconv failed"
 msgstr "Chiamata di sistema iconv non riuscita"
 
-#: lib/strerror-idna.c:114 lib/strerror-stringprep.c:122 lib/strerror-tld.c:72
+#: lib/strerror-idna.c:115 lib/strerror-stringprep.c:123 lib/strerror-tld.c:73
 msgid "Cannot allocate memory"
 msgstr "Impossibile allocare memoria"
 
-#: lib/strerror-idna.c:118
+#: lib/strerror-idna.c:119
 msgid "System dlopen failed"
 msgstr "Chiamata di sistema dlopen non riuscita"
 
-#: lib/strerror-idna.c:122 lib/strerror-pr29.c:70 lib/strerror-punycode.c:74
-#: lib/strerror-stringprep.c:126 lib/strerror-tld.c:84
+#: lib/strerror-idna.c:123 lib/strerror-pr29.c:71 lib/strerror-punycode.c:75
+#: lib/strerror-stringprep.c:127 lib/strerror-tld.c:85
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: lib/strerror-pr29.c:62
+#: lib/strerror-pr29.c:63
 msgid "String not idempotent under Unicode NFKC normalization"
 msgstr "La stringa non è idempotente per la normalizzazione Unicode NFKC"
 
-#: lib/strerror-punycode.c:62
+#: lib/strerror-punycode.c:63
 msgid "Invalid input"
 msgstr "Input non valido"
 
-#: lib/strerror-punycode.c:66 lib/strerror-stringprep.c:102
+#: lib/strerror-punycode.c:67 lib/strerror-stringprep.c:103
 msgid "Output would exceed the buffer space provided"
 msgstr "L'output eccederebbe il buffer fornito"
 
-#: lib/strerror-punycode.c:70
+#: lib/strerror-punycode.c:71
 msgid "String size limit exceeded"
 msgstr "Limite di grandezza della stringa superato"
 
-#: lib/strerror-stringprep.c:82
+#: lib/strerror-stringprep.c:83
 msgid "Forbidden unassigned code points in input"
 msgstr "Codepoints non assegnati proibiti nell'input"
 
-#: lib/strerror-stringprep.c:86
+#: lib/strerror-stringprep.c:87
 msgid "Prohibited code points in input"
 msgstr "Codepoints proibiti nell'input"
 
-#: lib/strerror-stringprep.c:90
+#: lib/strerror-stringprep.c:91
 msgid "Conflicting bidirectional properties in input"
 msgstr "Proprietà bidirezionali in conflitto nell'input"
 
-#: lib/strerror-stringprep.c:94
+#: lib/strerror-stringprep.c:95
 msgid "Malformed bidirectional string"
 msgstr "Stringa bidirezionale malformata"
 
-#: lib/strerror-stringprep.c:98
+#: lib/strerror-stringprep.c:99
 msgid "Prohibited bidirectional code points in input"
 msgstr "Codepoints bidirezionali proibiti nell'input"
 
-#: lib/strerror-stringprep.c:106
+#: lib/strerror-stringprep.c:107
 msgid "Error in stringprep profile definition"
 msgstr "Errore nella definizione del profilo stringprep"
 
-#: lib/strerror-stringprep.c:110
+#: lib/strerror-stringprep.c:111
 msgid "Flag conflict with profile"
 msgstr "Flag in conflitto con il profilo"
 
-#: lib/strerror-stringprep.c:114
+#: lib/strerror-stringprep.c:115
 msgid "Unknown profile"
 msgstr "Profilo sconosciuto"
 
-#: lib/strerror-stringprep.c:118
+#: lib/strerror-stringprep.c:119
 msgid "Unicode normalization failed (internal error)"
 msgstr "Normalizzazione Unicode non riuscita (errore interno)"
 
-#: lib/strerror-tld.c:64
+#: lib/strerror-tld.c:65
 msgid "Code points prohibited by top-level domain"
 msgstr "Codepoints proibiti dal dominio di primo livello"
 
-#: lib/strerror-tld.c:68
+#: lib/strerror-tld.c:69
 msgid "Missing input"
 msgstr "Input mancante"
 
-#: lib/strerror-tld.c:80
+#: lib/strerror-tld.c:81
 msgid "No top-level domain found in input"
 msgstr "Nessun dominio di primo livello trovato nell'input"
 
-#. TRANSLATORS: The placeholder indicates the bug-reporting address
-#. for this package.  Please add _another line_ saying
-#. "Report translation bugs to <...>\n" with the address for translation
-#. bugs (typically your translation team's web or email address).
 #: src/idn.c:68
 #, c-format
-msgid ""
-"\n"
-"Report bugs to <%s>.\n"
-msgstr ""
-"\n"
-"Segnalare i bug a <%s>.\n"
-"Segnalare i bug nella traduzione a <tp@lists.linux.it>.\n"
-
-#: src/idn.c:75
-#, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Usare \"%s --help\" per maggiori informazioni.\n"
 
-#: src/idn.c:79
+#: src/idn.c:72
 #, c-format
 msgid "Usage: %s [OPTION]... [STRINGS]...\n"
 msgstr "Uso: %s [OPZIONI]... [STRINGHE]...\n"
 
-#: src/idn.c:82
+#: src/idn.c:75
 msgid ""
 "Internationalized Domain Name (IDN) convert STRINGS, or standard input.\n"
 "\n"
@@ -164,7 +151,7 @@ msgstr ""
 "Converte STRINGHE (o lo standard input) in nomi di dominio internazionalizzato (IDN).\n"
 "\n"
 
-#: src/idn.c:86
+#: src/idn.c:79
 msgid ""
 "Command line interface to the internationalized domain name library.\n"
 "\n"
@@ -189,7 +176,7 @@ msgstr ""
 "\n"
 "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle corte.\n"
 
-#: src/idn.c:98
+#: src/idn.c:91
 msgid ""
 "  -h, --help               Print help and exit\n"
 "  -V, --version            Print version and exit\n"
@@ -197,7 +184,7 @@ msgstr ""
 "  -h, --help               Stampa questo aiuto ed esce\n"
 "  -V, --version            Stampa la versione ed esce\n"
 
-#: src/idn.c:102
+#: src/idn.c:95
 msgid ""
 "  -s, --stringprep         Prepare string according to nameprep profile\n"
 "  -d, --punycode-decode    Decode Punycode\n"
@@ -211,27 +198,27 @@ msgstr ""
 "  -a, --idna-to-ascii      Converti in ACE secondo IDNA (modalità predefinita)\n"
 "  -u, --idna-to-unicode    Converti da ACE secondo IDNA\n"
 
-#: src/idn.c:109
+#: src/idn.c:102
 msgid ""
-"      --allow-unassigned   Toggle IDNA AllowUnassigned flag\n"
-"      --usestd3asciirules  Toggle IDNA UseSTD3ASCIIRules flag\n"
+"      --allow-unassigned   Toggle IDNA AllowUnassigned flag (default off)\n"
+"      --usestd3asciirules  Toggle IDNA UseSTD3ASCIIRules flag (default off)\n"
 msgstr ""
 "      --allow-unassigned   Attiva l'opzione IDNA AllowUnassigned\n"
 "      --usestd3asciirules  Attiva l'opzione IDNA UseSTD3ASCIIRules\n"
 
-#: src/idn.c:113
+#: src/idn.c:106
 msgid ""
-"  -t, --tld                Check string for TLD specific rules\n"
+"      --no-tld             Don't check string for TLD specific rules\n"
 "                             Only for --idna-to-ascii and --idna-to-unicode\n"
 msgstr ""
-"  -t, --tld                Controlla le stringhe per regole specifiche su TLD\n"
+"      --no-tld             Non controllare le regole per TLD nelle stringhe\n"
 "                             Solo per --idna-to-ascii e --idna-to-unicode\n"
 
-#: src/idn.c:117
+#: src/idn.c:110
 msgid "  -n, --nfkc               Normalize string according to Unicode v3.2 NFKC\n"
 msgstr "  -n, --nfkc               Normalizza la stringa come Unicode v3.2 NFKC\n"
 
-#: src/idn.c:120
+#: src/idn.c:113
 msgid ""
 "  -p, --profile=STRING     Use specified stringprep profile instead\n"
 "                             Valid stringprep profiles: `Nameprep',\n"
@@ -243,7 +230,7 @@ msgstr ""
 "                             `iSCSI', `Nodeprep', `Resourceprep', \n"
 "                             `trace', `SASLprep'\n"
 
-#: src/idn.c:126
+#: src/idn.c:119
 msgid ""
 "      --debug              Print debugging information\n"
 "      --quiet              Silent operation\n"
@@ -251,88 +238,92 @@ msgstr ""
 "      --debug              Stampa le informazioni di debug\n"
 "      --quiet              Opera silenziosamente\n"
 
-#: src/idn.c:176
+#: src/idn.c:175
 #, c-format
-msgid "Only one of -s, -e, -d, -a, -u or -n can be specified."
-msgstr "Può essere indicato solo uno tra -s, -e, -d, -a, -u e -n."
+msgid "only one of -s, -e, -d, -a, -u or -n can be specified"
+msgstr "può essere indicato solo uno tra -s, -e, -d, -a, -u e -n"
 
-#: src/idn.c:184
+#: src/idn.c:185
 #, c-format
 msgid "Charset `%s'.\n"
 msgstr "Set di caratteri \"%s\".\n"
 
-#: src/idn.c:187
+#: src/idn.c:190
 #, c-format
 msgid "Type each input string on a line by itself, terminated by a newline character.\n"
 msgstr "Scrivere ogni stringa di input in una riga a sé, terminata da un carattere di newline.\n"
 
-#: src/idn.c:202
+#: src/idn.c:205
 #, c-format
-msgid "Input error"
-msgstr "Errore di input"
+msgid "input error"
+msgstr "errore di input"
 
-#: src/idn.c:212 src/idn.c:274 src/idn.c:357 src/idn.c:434 src/idn.c:515
+#: src/idn.c:215 src/idn.c:277 src/idn.c:360 src/idn.c:437 src/idn.c:518
 #, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "Impossibile convertire da %s a UTF-8."
+msgid "could not convert from %s to UTF-8"
+msgstr "impossibile convertire da %s a UTF-8"
 
-#: src/idn.c:220 src/idn.c:245 src/idn.c:281 src/idn.c:498 src/idn.c:527
-#: src/idn.c:551
+#: src/idn.c:223 src/idn.c:248 src/idn.c:284 src/idn.c:501 src/idn.c:530
+#: src/idn.c:554
 #, c-format
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "Impossibile convertire da UTF-8 a UCS-4."
+msgid "could not convert from UTF-8 to UCS-4"
+msgstr "impossibile convertire da UTF-8 a UCS-4"
 
-#: src/idn.c:237
+#: src/idn.c:240
 #, c-format
 msgid "stringprep_profile: %s"
 msgstr "stringprep_profile: %s"
 
-#: src/idn.c:260 src/idn.c:302 src/idn.c:345 src/idn.c:503 src/idn.c:564
+#: src/idn.c:263 src/idn.c:305 src/idn.c:348 src/idn.c:506 src/idn.c:567
 #, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "Impossibile convertire da UTF-8 a %s."
+msgid "could not convert from UTF-8 to %s"
+msgstr "impossibile convertire da UTF-8 a %s"
 
-#: src/idn.c:295
+#: src/idn.c:298
 #, c-format
 msgid "punycode_encode: %s"
 msgstr "punycode_encode: %s"
 
-#: src/idn.c:323
+#: src/idn.c:320
+msgid "malloc"
+msgstr "malloc"
+
+#: src/idn.c:326
 #, c-format
 msgid "punycode_decode: %s"
 msgstr "punycode_decode: %s"
 
-#: src/idn.c:340 src/idn.c:364 src/idn.c:442
+#: src/idn.c:343 src/idn.c:367 src/idn.c:445
 #, c-format
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "Impossibile convertire da UCS-4 a UTF-8."
+msgid "could not convert from UCS-4 to UTF-8"
+msgstr "impossibile convertire da UCS-4 a UTF-8"
 
-#: src/idn.c:381
+#: src/idn.c:384
 #, c-format
 msgid "idna_to_ascii_4z: %s"
 msgstr "idna_to_ascii_4z: %s"
 
-#: src/idn.c:395
+#: src/idn.c:398
 #, c-format
 msgid "idna_to_unicode_8z4z (TLD): %s"
 msgstr "idna_to_unicode_8z4z (TLD): %s"
 
-#: src/idn.c:409 src/idn.c:482
+#: src/idn.c:412 src/idn.c:485
 #, c-format
 msgid "tld_check_4z (position %lu): %s"
 msgstr "tld_check_4z (posizione %lu): %s"
 
-#: src/idn.c:412 src/idn.c:488
+#: src/idn.c:415 src/idn.c:491
 #, c-format
 msgid "tld_check_4z: %s"
 msgstr "tld_check_4z: %s"
 
-#: src/idn.c:461
+#: src/idn.c:464
 #, c-format
 msgid "idna_to_unicode_8z4z: %s"
 msgstr "idna_to_unicode_8z4z: %s"
 
-#: src/idn.c:540
+#: src/idn.c:543
 #, c-format
-msgid "Could not do NFKC normalization."
-msgstr "Impossibile effettuare la normalizzazione Unicode NFKC."
+msgid "could not do NFKC normalization"
+msgstr "impossibile effettuare la normalizzazione Unicode NFKC"
diff --git a/po/rw.po.in b/po/rw.po.in
deleted file mode 100644
index b025f3c..0000000
--- a/po/rw.po.in
+++ /dev/null
@@ -1,268 +0,0 @@
-# Kinyarwanda translations for libidn package.
-# Copyright (C) 2005, 2010, 2011 Free Software Foundation, Inc.
-# This file is distributed under the same license as the libidn package.
-# Steve Murphy <murf@e-tools.com>, 2005.
-# Steve performed initial rough translation from compendium built from translations provided by the following translators:
-# Philibert Ndandali  <ndandali@yahoo.fr>, 2005.
-# Viateur MUGENZI <muvia1@yahoo.fr>, 2005.
-# NoÃ«lla Mupole <s24211045@tuks.co.za>, 2005.
-# Carole Karema <karemacarole@hotmail.com>, 2005.
-# JEAN BAPTISTE NGENDAHAYO <ngenda_denis@yahoo.co.uk>, 2005.
-# Augustin KIBERWA  <akiberwa@yahoo.co.uk>, 2005.
-# Donatien NSENGIYUMVA <ndonatienuk@yahoo.co.uk>, 2005.
-# Antoine Bigirimana <antoine@e-tools.com>, 2005.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: libidn 0.5.6\n"
-"Report-Msgid-Bugs-To: bug-libidn@gnu.org\n"
-"POT-Creation-Date: 2004-10-02 21:50+0200\n"
-"PO-Revision-Date: 2005-04-04 10:55-0700\n"
-"Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
-"Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: lib/strerror-idna.c:70 lib/strerror-pr29.c:54 lib/strerror-punycode.c:54
-#: lib/strerror-stringprep.c:74 lib/strerror-tld.c:56
-msgid "Success"
-msgstr "Ibyatunganye"
-
-#: lib/strerror-idna.c:74 lib/strerror-pr29.c:62
-#, fuzzy
-msgid "String preparation failed"
-msgstr "Byanze"
-
-#: lib/strerror-idna.c:78
-#, fuzzy
-msgid "Punycode failed"
-msgstr "Byanze"
-
-#: lib/strerror-idna.c:82
-#, fuzzy
-msgid "Non-digit/letter/hyphen in input"
-msgstr "Ibaruwa... in Iyinjiza"
-
-#: lib/strerror-idna.c:86
-#, fuzzy
-msgid "Forbidden leading or trailing minus sign (`-')"
-msgstr "Nyobora Cyangwa IKIMENYETSO"
-
-#: lib/strerror-idna.c:90
-#, fuzzy
-msgid "Output would be too large or too small"
-msgstr "Binini Cyangwa Gitoya"
-
-#: lib/strerror-idna.c:94
-#, fuzzy
-msgid "Input does not start with ACE prefix (`xn--')"
-msgstr "OYA Gutangira Na: Imbanziriza"
-
-#: lib/strerror-idna.c:98
-#, fuzzy
-msgid "String not idempotent under ToASCII"
-msgstr "OYA"
-
-#: lib/strerror-idna.c:102
-#, fuzzy
-msgid "Input already contain ACE prefix (`xn--')"
-msgstr "Imbanziriza"
-
-#: lib/strerror-idna.c:106 lib/strerror-tld.c:72
-#, fuzzy
-msgid "System iconv failed"
-msgstr "Byanze"
-
-#: lib/strerror-idna.c:110 lib/strerror-stringprep.c:118 lib/strerror-tld.c:68
-#, fuzzy
-msgid "Cannot allocate memory"
-msgstr "Ububiko"
-
-#: lib/strerror-idna.c:114
-#, fuzzy
-msgid "System dlopen failed"
-msgstr "Byanze"
-
-#: lib/strerror-idna.c:118 lib/strerror-pr29.c:66 lib/strerror-punycode.c:70
-#: lib/strerror-stringprep.c:122 lib/strerror-tld.c:80
-msgid "Unknown error"
-msgstr "Ikosa itazwi"
-
-#: lib/strerror-pr29.c:58
-#, fuzzy
-msgid "String not idempotent under Unicode NFKC normalization"
-msgstr "OYA"
-
-#: lib/strerror-punycode.c:58
-msgid "Invalid input"
-msgstr "ibinjizwa bitemewe"
-
-#: lib/strerror-punycode.c:62 lib/strerror-stringprep.c:98
-#, fuzzy
-msgid "Output would exceed the buffer space provided"
-msgstr "i Umwanya"
-
-#: lib/strerror-punycode.c:66
-#, fuzzy
-msgid "String size limit exceeded"
-msgstr "Ingano"
-
-#: lib/strerror-stringprep.c:78
-#, fuzzy
-msgid "Forbidden unassigned code points in input"
-msgstr "ITEGEKONGENGA Utudomo in Iyinjiza"
-
-#: lib/strerror-stringprep.c:82
-#, fuzzy
-msgid "Prohibited code points in input"
-msgstr "ITEGEKONGENGA Utudomo in Iyinjiza"
-
-#: lib/strerror-stringprep.c:86
-#, fuzzy
-msgid "Conflicting bidirectional properties in input"
-msgstr "Indangakintu... in Iyinjiza"
-
-#: lib/strerror-stringprep.c:90
-#, fuzzy
-msgid "Malformed bidirectional string"
-msgstr "Ikurikiranyanyuguti"
-
-#: lib/strerror-stringprep.c:94
-#, fuzzy
-msgid "Prohibited bidirectional code points in input"
-msgstr "ITEGEKONGENGA Utudomo in Iyinjiza"
-
-#: lib/strerror-stringprep.c:102
-#, fuzzy
-msgid "Error in stringprep profile definition"
-msgstr "in Ibijyana Insobanuro"
-
-#: lib/strerror-stringprep.c:106
-#, fuzzy
-msgid "Flag conflict with profile"
-msgstr "Na: Ibijyana"
-
-#: lib/strerror-stringprep.c:110
-#, fuzzy
-msgid "Unknown profile"
-msgstr "Ibijyana"
-
-#: lib/strerror-stringprep.c:114
-#, fuzzy
-msgid "Unicode normalization failed (internal error)"
-msgstr "Byanze By'imbere Ikosa"
-
-#: lib/strerror-tld.c:60
-#, fuzzy
-msgid "Code points prohibited by top-level domain"
-msgstr "Utudomo ku Hejuru: urwego Urwego"
-
-#: lib/strerror-tld.c:64
-#, fuzzy
-msgid "Missing input"
-msgstr "Iyinjiza"
-
-#: lib/strerror-tld.c:76
-#, fuzzy
-msgid "No top-level domain found in input"
-msgstr "Hejuru: urwego Urwego Byabonetse in Iyinjiza"
-
-#: src/idn.c:89
-#, fuzzy
-msgid "Only one of -s, -e, -d, -a or -u can be specified."
-msgstr "Bya S E D a Cyangwa u"
-
-#: src/idn.c:98
-#, c-format
-msgid "Charset `%s'.\n"
-msgstr ""
-
-#: src/idn.c:101
-#, fuzzy, c-format
-msgid "Type each input string on a line by itself, terminated by a newline character.\n"
-msgstr "Iyinjiza Ikurikiranyanyuguti ku a Umurongo ku ku a Inyuguti"
-
-#: src/idn.c:116
-#, fuzzy
-msgid "Input error"
-msgstr "Ikosa"
-
-#: src/idn.c:126 src/idn.c:184 src/idn.c:261 src/idn.c:332
-#, fuzzy, c-format
-msgid "Could not convert from %s to UTF-8."
-msgstr "OYA GUHINDURA Bivuye Kuri 8"
-
-#: src/idn.c:133 src/idn.c:156 src/idn.c:190 src/idn.c:389
-#, fuzzy
-msgid "Could not convert from UTF-8 to UCS-4."
-msgstr "OYA GUHINDURA Bivuye 8 Kuri 4."
-
-#: src/idn.c:140 src/idn.c:196 src/idn.c:273 src/idn.c:346
-#, fuzzy, c-format
-msgid "input[%d] = U+%04x\n"
-msgstr "Iyinjiza U"
-
-#: src/idn.c:149
-#, c-format
-msgid "stringprep_profile: %s"
-msgstr ""
-
-#: src/idn.c:163 src/idn.c:237 src/idn.c:320 src/idn.c:363
-#, fuzzy, c-format
-msgid "output[%d] = U+%04x\n"
-msgstr "Ibisohoka U"
-
-#: src/idn.c:170 src/idn.c:209 src/idn.c:249 src/idn.c:394
-#, fuzzy, c-format
-msgid "Could not convert from UTF-8 to %s."
-msgstr "OYA GUHINDURA Bivuye 8 Kuri"
-
-#: src/idn.c:203
-#, c-format
-msgid "punycode_encode: %s"
-msgstr ""
-
-#: src/idn.c:224
-msgid "malloc"
-msgstr ""
-
-#: src/idn.c:230
-#, c-format
-msgid "punycode_decode: %s"
-msgstr ""
-
-#: src/idn.c:244 src/idn.c:267 src/idn.c:339
-#, fuzzy
-msgid "Could not convert from UCS-4 to UTF-8."
-msgstr "OYA GUHINDURA Bivuye 4. Kuri 8"
-
-#: src/idn.c:283
-#, c-format
-msgid "idna_to_ascii_4z: %s"
-msgstr ""
-
-#: src/idn.c:296
-#, c-format
-msgid "idna_to_unicode_8z4z (TLD): %s"
-msgstr ""
-
-#: src/idn.c:303
-#, fuzzy, c-format
-msgid "tld[%d] = U+%04x\n"
-msgstr "U"
-
-#: src/idn.c:309 src/idn.c:375
-#, fuzzy, c-format
-msgid "tld_check_4z (position %d): %s"
-msgstr "Ibirindiro"
-
-#: src/idn.c:312 src/idn.c:381
-#, c-format
-msgid "tld_check_4z: %s"
-msgstr ""
-
-#: src/idn.c:357
-#, c-format
-msgid "idna_to_unicode_8z4z: %s"
-msgstr ""
diff --git a/src/Makefile.am b/src/Makefile.am
index 4c8fe50..c59edb5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011
-# Simon Josefsson.
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/src/idn.c b/src/idn.c
index d2432a0..6f60d91 100644
--- a/src/idn.c
+++ b/src/idn.c
@@ -1,6 +1,5 @@
 /* idn.c --- Command line interface to libidn.
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- * Simon Josefsson
+ * Copyright (C) 2003-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/src/idn.ggo b/src/idn.ggo
index a0c5018..025541c 100644
--- a/src/idn.ggo
+++ b/src/idn.ggo
@@ -1,5 +1,4 @@
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-# Simon Josefsson.
+# Copyright (C) 2003-2012 Simon Josefsson.
 #
 # This file is part of GNU Libidn.
 #
diff --git a/src/idna.el b/src/idna.el
index 718fad2..2f539d6 100644
--- a/src/idna.el
+++ b/src/idna.el
@@ -1,7 +1,6 @@
 ;;; idna.el --- Internationalizing Domain Names in Applications.
 
-;; Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-;; Josefsson
+;; Copyright (C) 2003-2012 Simon Josefsson
 ;; Keywords: idna, idn, domain name, internationalization
 
 ;; This file is part of GNU Libidn.
diff --git a/src/punycode.el b/src/punycode.el
index e596a29..32f81b4 100644
--- a/src/punycode.el
+++ b/src/punycode.el
@@ -1,7 +1,6 @@
 ;;; punycode.el --- An ASCII compatible Unicode encoding format.
 
-;; Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
-;; Josefsson
+;; Copyright (C) 2003-2012 Simon Josefsson
 ;; Keywords: punycode, idna, idn, unicode, encoding
 
 ;; This file is part of GNU Libidn.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 62804d8..abfdd36 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Simon Josefsson
+# Copyright (C) 2002-2012 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
diff --git a/tests/tst_idna.c b/tests/tst_idna.c
index dd4c50d..8c4ab78 100644
--- a/tests/tst_idna.c
+++ b/tests/tst_idna.c
@@ -1,6 +1,5 @@
 /* tst_idna.c --- Self tests for idna_to_ascii().
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_idna2.c b/tests/tst_idna2.c
index 994aee7..4528d17 100644
--- a/tests/tst_idna2.c
+++ b/tests/tst_idna2.c
@@ -1,6 +1,5 @@
 /* tst_idna2.c --- Self tests for idna_to_ascii_8z().
- * Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011
- * Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_idna3.c b/tests/tst_idna3.c
index 4fa5734..acf03cb 100644
--- a/tests/tst_idna3.c
+++ b/tests/tst_idna3.c
@@ -1,5 +1,5 @@
 /* tst_idna3.c --- Self tests for upper-case XN-- regression.
- * Copyright (C) 2011 Simon Josefsson
+ * Copyright (C) 2011-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_idna4.c b/tests/tst_idna4.c
index 8ec69fb..cfccee4 100644
--- a/tests/tst_idna4.c
+++ b/tests/tst_idna4.c
@@ -1,5 +1,5 @@
 /* tst_idna4.c --- Self tests for memory leak regression.
- * Copyright (C) 2011 Simon Josefsson
+ * Copyright (C) 2011-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_nfkc.c b/tests/tst_nfkc.c
index 9cdf69c..86884d7 100644
--- a/tests/tst_nfkc.c
+++ b/tests/tst_nfkc.c
@@ -1,6 +1,5 @@
 /* tst_nfkc.c --- Self tests for stringprep_utf8_nfkc_normalize().
- * Copyright (C) 2002, 2003, 2004, 2006, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_pr29.c b/tests/tst_pr29.c
index eecda05..7d26ce7 100644
--- a/tests/tst_pr29.c
+++ b/tests/tst_pr29.c
@@ -1,6 +1,5 @@
 /* tst_pr29.c --- Self tests for pr29_*().
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_punycode.c b/tests/tst_punycode.c
index f8073ba..61a983a 100644
--- a/tests/tst_punycode.c
+++ b/tests/tst_punycode.c
@@ -1,6 +1,5 @@
 /* tst_punycode.c --- Self tests for punycode.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_strerror.c b/tests/tst_strerror.c
index 0d5b44d..87e2dcf 100644
--- a/tests/tst_strerror.c
+++ b/tests/tst_strerror.c
@@ -1,6 +1,5 @@
 /* tst_strerror.c --- Self tests for *_strerror().
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_stringprep.c b/tests/tst_stringprep.c
index f6744c8..a55f30b 100644
--- a/tests/tst_stringprep.c
+++ b/tests/tst_stringprep.c
@@ -1,6 +1,5 @@
 /* tst_stringprep.c --- Self tests for stringprep().
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_symbols.c b/tests/tst_symbols.c
index 590fb32..86d4f84 100644
--- a/tests/tst_symbols.c
+++ b/tests/tst_symbols.c
@@ -1,5 +1,5 @@
 /* tst_symbols.c --- Test if all exported symbols are available.
- * Copyright (C) 2010, 2011 Simon Josefsson
+ * Copyright (C) 2010-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_tld.c b/tests/tst_tld.c
index 8ad31c0..919d560 100644
--- a/tests/tst_tld.c
+++ b/tests/tst_tld.c
@@ -1,6 +1,5 @@
 /* tst_tld.c --- Self tests for tld_*().
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Simon
- * Josefsson
+ * Copyright (C) 2004-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/tst_toutf8.c b/tests/tst_toutf8.c
index 99289a7..a98f012 100644
--- a/tests/tst_toutf8.c
+++ b/tests/tst_toutf8.c
@@ -1,6 +1,5 @@
 /* tst_toutf8.c --- Self tests for UTF-8 conversion functions.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/utils.c b/tests/utils.c
index c2444bd..2999778 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -1,6 +1,5 @@
 /* utils.c --- Self test utilities.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/tests/utils.h b/tests/utils.h
index d0f5af8..8709e79 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -1,6 +1,5 @@
 /* utils.h --- Prototypes for self test utilities.
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- * 2011 Simon Josefsson
+ * Copyright (C) 2002-2012 Simon Josefsson
  *
  * This file is part of GNU Libidn.
  *
diff --git a/win32/include/ac-stdint.h b/win32/include/ac-stdint.h
index 358e39e..ee58092 100644
--- a/win32/include/ac-stdint.h
+++ b/win32/include/ac-stdint.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2008-2012 Free Software Foundation, Inc.
    Written by Adam Strzelecki <ono@java.pl>
 
    This program is free software; you can redistribute it and/or
diff --git a/win32/include/idn-int.h b/win32/include/idn-int.h
index a239e5d..7478f43 100644
--- a/win32/include/idn-int.h
+++ b/win32/include/idn-int.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2008-2012 Free Software Foundation, Inc.
    Written by Adam Strzelecki <ono@java.pl>
 
    This program is free software; you can redistribute it and/or
diff --git a/win32/include/stdbool.h b/win32/include/stdbool.h
index 3cb41ab..d10a6da 100644
--- a/win32/include/stdbool.h
+++ b/win32/include/stdbool.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2008-2012 Free Software Foundation, Inc.
    Written by Adam Strzelecki <ono@java.pl>
 
    This program is free software; you can redistribute it and/or
diff --git a/win32/libidn4win.mk b/win32/libidn4win.mk
index 3f16595..24f41f0 100644
--- a/win32/libidn4win.mk
+++ b/win32/libidn4win.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2011 Simon Josefsson
+# Copyright (C) 2011-2012 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Sun Jan 08 18:43:45 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Rk2Ov-00045A-7P
	for mharc-libidn-commit@gnu.org; Sun, 08 Jan 2012 18:43:45 -0500
Received: from eggs.gnu.org ([140.186.70.92]:53848)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Rk2ON-00044o-5z
	for libidn-commit@gnu.org; Sun, 08 Jan 2012 18:43:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Rk2Nw-0001W1-1d
	for libidn-commit@gnu.org; Sun, 08 Jan 2012 18:43:11 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:44926)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Rk2Nv-0001Vx-CG
	for libidn-commit@gnu.org; Sun, 08 Jan 2012 18:42:43 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1Rk2Nu-0003U6-FO
	for libidn-commit@gnu.org; Sun, 08 Jan 2012 23:42:43 +0000
Date: Sun, 08 Jan 2012 23:42:42 +0000
Message-Id: <E1Rk2Nu-0003U6-FO@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-23-29-g74ea868
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 9183f8ac255addb4360bc25c3bd4583dbe10d3d7
X-Git-Newrev: 74ea8682cbb89e45867425082959966cdec56b23
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jan 2012 23:43:41 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=74ea8682cbb89e45867425082959966cdec56b23

The branch, master has been updated
       via  74ea8682cbb89e45867425082959966cdec56b23 (commit)
       via  8cc49246246288e5f0dbb1412eeb974765af5c15 (commit)
       via  b9123f45a0c966e125bd8e272765f621c860b647 (commit)
       via  130d4a479f31dc5250072722fef2ae7d85c27657 (commit)
       via  5b0fde9eb52e841cd2144cfd45bbddca40867fe8 (commit)
       via  ef04dfad2ad45926d13a6a057c8de03e71d4f3cf (commit)
       via  d114facbbe0d623156fe796558a6ffda8fdbb6cd (commit)
       via  a4116421f343522d67e13d685c3970a3262c6078 (commit)
       via  9a180e2cca3a1d43dd5f2abc6afcc080378a6cd9 (commit)
       via  f5809a1b17f5071661fc6609d7eff306c02daf2e (commit)
       via  9ea891aec1c1e4eb40ba5b3f52a1696b2dcda0bb (commit)
       via  3235e05a5769624e016d288532837f415cc53194 (commit)
       via  1bd2d68bd89f85dbfe6a614e0cd7fb1f049d8698 (commit)
       via  b1d44908f49cc6cd85ca2332d4af704f55413f5f (commit)
       via  b45deaf855dfec2bb1d13f5bf306829e62f35ade (commit)
      from  9183f8ac255addb4360bc25c3bd4583dbe10d3d7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 74ea8682cbb89e45867425082959966cdec56b23
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 9 00:42:34 2012 +0100

    Sync intro texts.

commit 8cc49246246288e5f0dbb1412eeb974765af5c15
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 9 00:27:46 2012 +0100

    Also dist COPYING* files.

commit b9123f45a0c966e125bd8e272765f621c860b647
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 9 00:21:04 2012 +0100

    Update gnulib files.

commit 130d4a479f31dc5250072722fef2ae7d85c27657
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 9 00:16:57 2012 +0100

    tst_pr29: Print more debug info.

commit 5b0fde9eb52e841cd2144cfd45bbddca40867fe8
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 9 00:10:48 2012 +0100

    libidn: Add 'const' keyword to 'stringprep_ucs4_nfkc_normalize' function.

commit ef04dfad2ad45926d13a6a057c8de03e71d4f3cf
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sun Jan 8 23:51:39 2012 +0100

    Fix typo.

commit d114facbbe0d623156fe796558a6ffda8fdbb6cd
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sun Jan 8 23:51:26 2012 +0100

    libidn: Fix potential infloop in pr29 code.
    
    Reported by Jon Nelson <jnelson@jamponi.net> in
    <http://lists.gnu.org/archive/html/help-libidn/2012-01/msg00008.html>.

commit a4116421f343522d67e13d685c3970a3262c6078
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sun Jan 8 23:10:57 2012 +0100

    Fix.

commit 9a180e2cca3a1d43dd5f2abc6afcc080378a6cd9
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sun Jan 8 23:10:12 2012 +0100

    Cleanup copyright info.

commit f5809a1b17f5071661fc6609d7eff306c02daf2e
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sun Jan 8 23:08:59 2012 +0100

    Update gnulib files.

commit 9ea891aec1c1e4eb40ba5b3f52a1696b2dcda0bb
Author: Simon Josefsson <simon@josefsson.org>
Date:   Sun Jan 8 13:43:38 2012 +0100

    Relicense libraries from LGPLv2+ to dual-GPLv2+|LGPLv3+.

commit 3235e05a5769624e016d288532837f415cc53194
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Jan 5 10:24:23 2012 +0100

    Put strlen calls in its own line, to simplify valgrind output analysis.

commit 1bd2d68bd89f85dbfe6a614e0cd7fb1f049d8698
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Jan 5 10:21:09 2012 +0100

    Update gnulib files.

commit b1d44908f49cc6cd85ca2332d4af704f55413f5f
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Jan 5 10:19:31 2012 +0100

    Rename README-alpha to HACKING and include it in tarballs.

commit b45deaf855dfec2bb1d13f5bf306829e62f35ade
Author: Simon Josefsson <simon@josefsson.org>
Date:   Thu Jan 5 10:13:34 2012 +0100

    Print whether libiconv was found.

-----------------------------------------------------------------------

Summary of changes:
 COPYING                                         |  689 +-----------
 COPYING.LIB => COPYING.LESSERv2                 |    0
 COPYING.LESSERv3                                |  165 +++
 COPYINGv2                                       |  339 ++++++
 COPYING => COPYINGv3                            |    0
 GNUmakefile                                     |    4 +-
 README-alpha => HACKING                         |   10 +-
 Makefile.am                                     |    3 +
 NEWS                                            |    8 +
 README                                          |   10 +-
 THANKS                                          |    1 +
 build-aux/gnupload                              |   12 +-
 build-aux/useless-if-before-free                |    8 +-
 configure.ac                                    |    1 +
 csharp/AssemblyInfo.cs                          |  148 ++-
 csharp/IDNA.cs                                  |   41 +-
 csharp/IDNAException.cs                         |   41 +-
 csharp/Makefile.am                              |   18 +-
 csharp/NFKC.cs                                  |   41 +-
 csharp/Punycode.cs                              |   41 +-
 csharp/PunycodeException.cs                     |   41 +-
 csharp/Stringprep.cs                            |   41 +-
 csharp/StringprepException.cs                   |   41 +-
 csharp/generate/AssemblyInfo.cs                 |  120 ++-
 csharp/generate/GenerateNFKC.cs                 | 1380 ++++++++++++-----------
 csharp/generate/GenerateRFC3454.cs              |  598 +++++-----
 csharp/generate/HashSet.cs                      |  192 ++--
 csharp/generate/Program.cs                      |   88 +-
 csharp/generate/Tokenizer.cs                    |  456 ++++----
 doc/Makefile.am                                 |    8 +-
 doc/gpl-3.0.texi                                |  717 ------------
 doc/lgpl-2.1.texi                               |  549 ---------
 doc/libidn.texi                                 |   37 +-
 doc/reference/libidn-docs.sgml                  |   11 +-
 gl/Makefile.am                                  |    2 +-
 gl/error.c                                      |   13 +-
 gl/error.h                                      |    6 +-
 gl/getopt.c                                     |   64 +-
 gl/getopt.in.h                                  |   52 +-
 gl/getopt1.c                                    |    4 +-
 gl/getopt_int.h                                 |   14 +-
 gl/m4/alloca.m4                                 |   16 +-
 gl/m4/extensions.m4                             |    4 +-
 gl/m4/gnulib-cache.m4                           |    4 +-
 gl/m4/gnulib-common.m4                          |    6 +-
 gl/m4/gnulib-comp.m4                            |    4 -
 gl/m4/include_next.m4                           |    2 +-
 gl/m4/inttypes.m4                               |    3 +-
 gl/m4/longlong.m4                               |    6 +-
 gl/m4/lstat.m4                                  |    4 +-
 gl/m4/time_h.m4                                 |    2 +-
 gl/msvc-inval.c                                 |    2 +-
 gl/msvc-inval.h                                 |    2 +-
 gl/msvc-nothrow.c                               |    2 +-
 gl/verify.h                                     |   14 +-
 gl/version-etc.h                                |    4 +-
 gltests/Makefile.am                             |    4 +-
 gltests/dup2.c                                  |    2 +-
 gltests/fcntl.in.h                              |    4 +-
 gltests/getcwd-lgpl.c                           |    2 +-
 gltests/init.sh                                 |    8 +-
 gltests/inttypes.in.h                           |   26 +-
 gltests/lstat.c                                 |    6 +-
 gltests/putenv.c                                |    4 +-
 gltests/setenv.c                                |   10 +-
 gltests/stdio.in.h                              |    6 +-
 gltests/test-dup2.c                             |    6 +-
 gltests/test-init.sh                            |   12 +-
 gltests/test-vc-list-files-cvs.sh               |    1 -
 gltests/unsetenv.c                              |    2 +-
 java/Makefile.am                                |   17 +-
 java/gnu/Makefile.am                            |   18 +
 java/gnu/inet/Makefile.am                       |   18 +
 java/gnu/inet/encoding/IDNA.java                |   50 +-
 java/gnu/inet/encoding/IDNAException.java       |   50 +-
 java/gnu/inet/encoding/Makefile.am              |   25 +-
 java/gnu/inet/encoding/NFKC.java                |   50 +-
 java/gnu/inet/encoding/Punycode.java            |   50 +-
 java/gnu/inet/encoding/PunycodeException.java   |   50 +-
 java/gnu/inet/encoding/Stringprep.java          |   50 +-
 java/gnu/inet/encoding/StringprepException.java |   50 +-
 java/misc/GenerateNFKC.java                     |   50 +-
 java/misc/GenerateRFC3454.java                  |   50 +-
 java/misc/Makefile.am                           |   28 +-
 java/misc/TestIDNA.java                         |   50 +-
 java/misc/TestNFKC.java                         |   50 +-
 lib/Makefile.am                                 |   17 +-
 lib/gl/m4/alloca.m4                             |   16 +-
 lib/gl/m4/extensions.m4                         |    4 +-
 lib/gl/m4/gnulib-common.m4                      |    6 +-
 lib/gl/m4/include_next.m4                       |    2 +-
 lib/gl/m4/inttypes.m4                           |    3 +-
 lib/gl/m4/ld-version-script.m4                  |   15 +-
 lib/gl/m4/locale-fr.m4                          |   10 +-
 lib/gl/m4/locale-ja.m4                          |    9 +-
 lib/gl/m4/locale-tr.m4                          |    6 +-
 lib/gl/m4/locale-zh.m4                          |    6 +-
 lib/gl/m4/longlong.m4                           |    6 +-
 lib/gl/m4/threadlib.m4                          |   32 +-
 lib/gl/strverscmp.c                             |    2 +-
 lib/gltests/Makefile.am                         |    4 +-
 lib/gltests/glthread/lock.c                     |    2 +-
 lib/gltests/glthread/lock.h                     |   14 +-
 lib/gltests/glthread/thread.c                   |    2 +-
 lib/gltests/glthread/thread.h                   |    4 +-
 lib/gltests/glthread/yield.h                    |    4 +-
 lib/gltests/init.sh                             |    8 +-
 lib/gltests/inttypes.in.h                       |   26 +-
 lib/gltests/localename.c                        |   24 +-
 lib/gltests/putenv.c                            |    4 +-
 lib/gltests/setenv.c                            |   10 +-
 lib/gltests/setlocale.c                         |    2 +-
 lib/gltests/test-init.sh                        |   12 +-
 lib/gltests/test-lock.c                         |   12 +-
 lib/gltests/test-setlocale2.sh                  |    6 +-
 lib/gltests/test-thread_create.c                |    2 +-
 lib/gltests/unsetenv.c                          |    2 +-
 lib/gltests/verify.h                            |   14 +-
 lib/idn-free.c                                  |   49 +-
 lib/idn-free.h                                  |   49 +-
 lib/idna.c                                      |   54 +-
 lib/idna.h                                      |   48 +-
 lib/libidn.map                                  |   17 +-
 lib/nfkc.c                                      |   52 +-
 lib/pr29.c                                      |   48 +-
 lib/pr29.h                                      |   46 +-
 lib/profiles.c                                  |   46 +-
 lib/punycode.c                                  |   46 +-
 lib/punycode.h                                  |   49 +-
 lib/strerror-idna.c                             |   46 +-
 lib/strerror-pr29.c                             |   46 +-
 lib/strerror-punycode.c                         |   46 +-
 lib/strerror-stringprep.c                       |   46 +-
 lib/strerror-tld.c                              |   46 +-
 lib/stringprep.c                                |   46 +-
 lib/stringprep.h                                |   48 +-
 lib/tld.c                                       |   54 +-
 lib/tld.h                                       |   52 +-
 lib/toutf8.c                                    |   46 +-
 lib/version.c                                   |   44 +-
 libc/example.c                                  |   19 +-
 maint.mk                                        |   26 +-
 pom.xml.in                                      |    2 +-
 src/idn.c                                       |    8 +-
 tests/tst_pr29.c                                |   35 +-
 tests/utils.c                                   |    2 +-
 win32/include/ac-stdint.h                       |   33 +-
 win32/include/config.h                          |   29 +
 win32/include/idn-int.h                         |   33 +-
 win32/include/stdbool.h                         |   33 +-
 150 files changed, 3754 insertions(+), 4614 deletions(-)
 rename COPYING.LIB => COPYING.LESSERv2 (100%)
 create mode 100644 COPYING.LESSERv3
 create mode 100644 COPYINGv2
 copy COPYING => COPYINGv3 (100%)
 rename README-alpha => HACKING (84%)
 delete mode 100644 doc/gpl-3.0.texi
 delete mode 100644 doc/lgpl-2.1.texi

diff --git a/COPYING b/COPYING
index 94a9ed0..f651116 100644
--- a/COPYING
+++ b/COPYING
@@ -1,674 +1,27 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+Libidn COPYING -- Explanation of licensing conditions.
+Copyright (C) 2002-2012 Simon Josefsson
+See the end for copying conditions.
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+The source code for the C library (libidn.a or libidn.so), the C#
+library (Libidn.dll) and the Java library (libidn-*.jar) are licensed
+under the terms of either the GNU General Public License version 2.0
+or later (see the file COPYINGv2) or the GNU Lesser General Public
+License version 3.0 or later (see the file COPYING.LESSERv3), or both
+in parallel as here.
 
-                            Preamble
+The manual is licensed under the GNU Free Documentation License,
+Version 1.3 or any later.
 
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+The command line tool, self tests, examples, and other auxilliary
+files, are licensed under the GNU General Public License version 3.0
+or later.
 
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+Other files are licensed as indicated in each file.
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+There may be exceptions to these general rules, see each file for
+precise information.
 
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+----------------------------------------------------------------------
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
diff --git a/COPYING.LIB b/COPYING.LESSERv2
similarity index 100%
rename from COPYING.LIB
rename to COPYING.LESSERv2
diff --git a/COPYING.LESSERv3 b/COPYING.LESSERv3
new file mode 100644
index 0000000..65c5ca8
--- /dev/null
+++ b/COPYING.LESSERv3
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/COPYINGv2 b/COPYINGv2
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/COPYINGv2
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/COPYING b/COPYINGv3
similarity index 100%
copy from COPYING
copy to COPYINGv3
diff --git a/GNUmakefile b/GNUmakefile
index f343cef..d0fd3e8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-# Having a separate GNUmakefile lets me `include' the dynamically
+# Having a separate GNUmakefile lets me 'include' the dynamically
 # generated rules created via cfg.mk (package-local configuration)
 # as well as maint.mk (generic maintainer rules).
 # This makefile is used only if you run GNU Make.
@@ -114,7 +114,7 @@ endif
 
 abort-due-to-no-makefile:
 	@echo There seems to be no Makefile in this directory.   1>&2
-	@echo "You must run ./configure before running \`make'." 1>&2
+	@echo "You must run ./configure before running 'make'." 1>&2
 	@exit 1
 
 endif
diff --git a/README-alpha b/HACKING
similarity index 84%
rename from README-alpha
rename to HACKING
index 843268c..15a0e8f 100644
--- a/README-alpha
+++ b/HACKING
@@ -1,4 +1,4 @@
-Libidn README-alpha -- Information for developers.              -*- outline -*-
+Libidn HACKING -- Information for contributors.                 -*- outline -*-
 Copyright (C) 2009-2012 Simon Josefsson
 See the end for copying conditions.
 
@@ -34,10 +34,10 @@ system, and the instructions for installing them differ.  Here are
 some hints:
 
 gNewSense/Debian/Ubuntu:
-sudo apt-get install make git-core autoconf automake libtool gettext cvs
-sudo apt-get install texinfo texlive texlive-generic-recommended texlive-extra-utils
-sudo apt-get install help2man gtk-doc-tools valgrind gengetopt
-sudo apt-get install gcj gjdoc transfig mono-mcs binfmt-support gperf
+apt-get install make git-core autoconf automake libtool gettext cvs
+apt-get install texinfo texlive texlive-generic-recommended texlive-extra-utils
+apt-get install help2man gtk-doc-tools valgrind gengetopt
+apt-get install gcj-jdk gjdoc transfig mono-mcs binfmt-support gperf
 
 To download the version controlled sources:
 
diff --git a/Makefile.am b/Makefile.am
index d3a2474..522a76f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,6 +20,7 @@ SUBDIRS = gl lib/gl lib po src doc gltests lib/gltests tests examples	\
 	java csharp
 
 EXTRA_DIST = cfg.mk maint.mk .clcopying
+EXTRA_DIST += COPYING.LESSERv2 COPYING.LESSERv3 COPYINGv2 COPYINGv3
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/gl/m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
@@ -40,5 +41,7 @@ EXTRA_DIST += win32/libidn.sln win32/libidn.vcproj			\
 	win32/include/stdbool.h win32/include/ac-stdint.h		\
 	win32/include/config.h win32/libidn4win.mk
 
+EXTRA_DIST += HACKING
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libidn.pc
diff --git a/NEWS b/NEWS
index 55321a3..1b4db5d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,9 +4,17 @@ See the end for copying conditions.
 
 * Version 1.24 (unreleased) [?]
 
+** Libraries are re-licensed from LGPLv2+ to dual-GPLv2+|LGPLv3+.
+
 ** build: Fix parallel Windows builds.
 Reported by RenÃ© Berber <r.berber@computer.org>.
 
+** libidn: Fix potential infloop in pr29 code.
+Reported by Jon Nelson <jnelson@jamponi.net> in
+<http://lists.gnu.org/archive/html/help-libidn/2012-01/msg00008.html>.
+
+** libidn: Add 'const' keyword to 'stringprep_ucs4_nfkc_normalize' function.
+
 ** Sync glib NFKC code and improve copyright/license statements.
 
 ** Update gnulib files and translations.
diff --git a/README b/README
index 135c359..cf1fc8c 100644
--- a/README
+++ b/README
@@ -4,19 +4,11 @@ See the end for copying conditions.
 
 Libidn is a package for internationalized string handling based on the
 Stringprep, Punycode, IDNA and TLD specifications.  Libidn is a GNU
-project.
+project.  See the file COPYING for licensing information.
 
 Read INSTALL for installation instructions, and doc/libidn.* for the
 manual in various formats (including Info, HTML, PostScript, and PDF).
 
-The C library (libidn.a), C# library (Libidn.dll) and Java library
-(libidn-*.jar) are licensed under the GNU Lesser General Public
-License version 2.1 or later.  See the file COPYING.LIB.
-
-The command line tool, self tests, examples, and other auxilliary
-files, are licensed under the GNU General Public License version 3.0
-or later.  See the file COPYING.
-
 Libidn will not be stable without your help.  Report bugs, proof read
 the manual, or make a monetary donation.
 
diff --git a/THANKS b/THANKS
index 858c33e..3fdd879 100644
--- a/THANKS
+++ b/THANKS
@@ -101,6 +101,7 @@ Volker Grabsch <vog@notjusthosting.com>
 Olga Limburg <olimburg@gmail.com>
 Bittner Ede <bittner.ede@euronetrt.hu>
 RenÃ© Berber <r.berber@computer.org>
+Jon Nelson <jnelson@jamponi.net>
 
 ----------------------------------------------------------------------
 Copying and distribution of this file, with or without modification,
diff --git a/build-aux/gnupload b/build-aux/gnupload
index 68215ca..24e91f4 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -57,7 +57,7 @@ Options:
   --version                output version information and exit
 
 If --symlink-regex is given without EXPR, then the link target name
-is created by replacing the version information with \`-latest', e.g.:
+is created by replacing the version information with '-latest', e.g.:
 
   foo-1.3.4.tar.gz -> foo-latest.tar.gz
 
@@ -170,7 +170,7 @@ while test -n "$1"; do
       break
       ;;
     -*)
-      echo "$0: Unknown option \`$1', try \`$0 --help'" 1>&2
+      echo "$0: Unknown option '$1', try '$0 --help'" 1>&2
       exit 1
       ;;
     esac
@@ -219,7 +219,7 @@ else
   for file
   do
     if test ! -f $file; then
-      echo "$0: Cannot find \`$file'" 1>&2
+      echo "$0: Cannot find '$file'" 1>&2
       exit 1
     elif test -n "$symlink_expr"; then
       linkname=`echo $file | sed "$symlink_expr"`
@@ -238,10 +238,10 @@ fi
 unset passphrase
 
 # Reset PATH to be sure that echo is a built-in.  We will later use
-# `echo $passphrase' to output the passphrase, so it is important that
-# it is a built-in (third-party programs tend to appear in `ps'
+# 'echo $passphrase' to output the passphrase, so it is important that
+# it is a built-in (third-party programs tend to appear in 'ps'
 # listings with their arguments...).
-# Remember this script runs with `set -e', so if echo is not built-in
+# Remember this script runs with 'set -e', so if echo is not built-in
 # it will exit now.
 PATH=/empty echo -n "Enter GPG passphrase: "
 stty -echo
diff --git a/build-aux/useless-if-before-free b/build-aux/useless-if-before-free
index b1c5902..2b64630 100755
--- a/build-aux/useless-if-before-free
+++ b/build-aux/useless-if-before-free
@@ -4,7 +4,7 @@ eval '(exit $?0)' && eval 'exec perl -wST "$0" ${1+"$@"}'
 # Detect instances of "if (p) free (p);".
 # Likewise "if (p != 0)", "if (0 != p)", or with NULL; and with braces.
 
-my $VERSION = '2011-04-20 13:43'; # UTC
+my $VERSION = '2012-01-06 07:23'; # UTC
 # The definition above must lie within the first 8 lines in order
 # for the Emacs time-stamp write hook (at end) to update it.
 # If you change this file with Emacs, please let the write hook
@@ -47,7 +47,7 @@ sub usage ($)
   my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
   if ($exit_code != 0)
     {
-      print $STREAM "Try `$ME --help' for more information.\n";
+      print $STREAM "Try '$ME --help' for more information.\n";
     }
   else
     {
@@ -62,7 +62,7 @@ detect free-like functions named FOO and BAR.
 OPTIONS:
 
    --list       print only the name of each matching FILE (\\0-terminated)
-   --name=N     add name N to the list of \`free\'-like functions to detect;
+   --name=N     add name N to the list of \'free\'-like functions to detect;
                   may be repeated
 
    --help       display this help and exit
@@ -125,7 +125,7 @@ sub is_NULL ($)
   foreach my $file (@ARGV)
     {
       open FH, '<', $file
-        or (warn "$ME: can't open `$file' for reading: $!\n"),
+        or (warn "$ME: can't open '$file' for reading: $!\n"),
           $err = EXIT_ERROR, next;
       while (defined (my $line = <FH>))
         {
diff --git a/configure.ac b/configure.ac
index 7e5a67f..dc340da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,6 +196,7 @@ AC_MSG_NOTICE([summary of build options:
   Compiler:         ${CC}
   Warning flags:    ${WARN_CFLAGS}
   Library types:    Shared=${enable_shared}, Static=${enable_static}
+  Libiconv:         $am_cv_func_iconv
   Valgrind:         ${VALGRIND}
   Version script:   $have_ld_version_script
   TLD code:         $enable_tld
diff --git a/csharp/AssemblyInfo.cs b/csharp/AssemblyInfo.cs
index 177a4f0..5e14dd9 100644
--- a/csharp/AssemblyInfo.cs
+++ b/csharp/AssemblyInfo.cs
@@ -1,58 +1,90 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]		
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("1.0.*")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("")]
+/// <summary>
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
+///
+/// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
+///
+/// This file is part of GNU Libidn.
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
+/// </summary>
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Versionu
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing.
+//
+// Notes:
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/csharp/IDNA.cs b/csharp/IDNA.cs
index 6c785a2..47e999a 100644
--- a/csharp/IDNA.cs
+++ b/csharp/IDNA.cs
@@ -1,24 +1,33 @@
 /// <summary>
 /// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
+///
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
-/// *
+///
 /// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
 /// </summary>
 
 using System;
diff --git a/csharp/IDNAException.cs b/csharp/IDNAException.cs
index 4a8033d..2a1a6a5 100644
--- a/csharp/IDNAException.cs
+++ b/csharp/IDNAException.cs
@@ -1,24 +1,33 @@
 /// <summary>
 /// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
+///
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
-/// *
+///
 /// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
 /// </summary>
 
 using System;
diff --git a/csharp/Makefile.am b/csharp/Makefile.am
index 2bf9aff..e1d2f74 100644
--- a/csharp/Makefile.am
+++ b/csharp/Makefile.am
@@ -3,20 +3,18 @@
 #
 # This file is part of GNU Libidn.
 #
-# GNU Libidn is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# GNU Libidn is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with GNU Libidn; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 CSHARPEXEC = $(SHELL) $(top_builddir)/csharpexec.sh
 CSHARPCOMP = $(SHELL) $(top_builddir)/csharpcomp.sh
diff --git a/csharp/NFKC.cs b/csharp/NFKC.cs
index 5d4fb54..5ad4fb0 100644
--- a/csharp/NFKC.cs
+++ b/csharp/NFKC.cs
@@ -1,24 +1,33 @@
 /// <summary>
 /// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
+///
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
-/// *
+///
 /// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
 /// </summary>
 
 using System;
diff --git a/csharp/Punycode.cs b/csharp/Punycode.cs
index e23c2b8..3595088 100644
--- a/csharp/Punycode.cs
+++ b/csharp/Punycode.cs
@@ -1,24 +1,33 @@
 /// <summary>
 /// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
+///
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
-/// *
+///
 /// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
 /// </summary>
 
 using System;
diff --git a/csharp/PunycodeException.cs b/csharp/PunycodeException.cs
index 779fb48..371fc13 100644
--- a/csharp/PunycodeException.cs
+++ b/csharp/PunycodeException.cs
@@ -1,24 +1,33 @@
 /// <summary>
 /// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
+///
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
-/// *
+///
 /// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
 /// </summary>
 
 using System;
diff --git a/csharp/Stringprep.cs b/csharp/Stringprep.cs
index 8156d90..b87647b 100644
--- a/csharp/Stringprep.cs
+++ b/csharp/Stringprep.cs
@@ -1,24 +1,33 @@
 /// <summary>
 /// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
+///
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
-/// *
+///
 /// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
 /// </summary>
 
 using System;
diff --git a/csharp/StringprepException.cs b/csharp/StringprepException.cs
index edb39bc..a1b0e31 100644
--- a/csharp/StringprepException.cs
+++ b/csharp/StringprepException.cs
@@ -1,24 +1,33 @@
 /// <summary>
 /// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
+///
 /// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
-/// *
+///
 /// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
 /// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
 /// </summary>
 
 using System;
diff --git a/csharp/generate/AssemblyInfo.cs b/csharp/generate/AssemblyInfo.cs
index 92642c8..956476d 100644
--- a/csharp/generate/AssemblyInfo.cs
+++ b/csharp/generate/AssemblyInfo.cs
@@ -1,55 +1,65 @@
-/// <summary>
-/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
-/// Author: Alexander Gnauck AG-Software
-/// *
-/// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
-/// </summary>
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("6D72484E-39BA-4312-9B64-74FD5CB81001")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+/// <summary>
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
+///
+/// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
+///
+/// This file is part of GNU Libidn.
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
+/// </summary>
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("6D72484E-39BA-4312-9B64-74FD5CB81001")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/csharp/generate/GenerateNFKC.cs b/csharp/generate/GenerateNFKC.cs
index ca68c80..e7d321f 100644
--- a/csharp/generate/GenerateNFKC.cs
+++ b/csharp/generate/GenerateNFKC.cs
@@ -1,685 +1,695 @@
-/// <summary>
-/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
-/// Author: Alexander Gnauck AG-Software
-/// *
-/// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
-/// </summary>
-using System;
-using System.IO;
-using System.Collections;
-using System.Text;
-
-namespace gnu.inet.encoding.misc
-{
-    public class GenerateNFKC
-    {
-        internal static string stripComment(string sIn)
-        {
-            int c = sIn.IndexOf('#');
-            if (c == -1)
-            {
-                return sIn;
-            }
-            else
-            {
-                return sIn.Substring(0, (c) - (0));
-            }
-        }
-
-        internal static string[] split(string sIn, char sep)
-        {
-            StringBuilder sb = new StringBuilder(sIn);
-            int c = 0;
-            for (int i = 0; i < sb.Length; i++)
-            {
-                if (sb[i] == sep)
-                {
-                    c++;
-                }
-            }
-
-            string[] sOut = new string[c + 1];
-            c = 0;
-            int l = 0;
-            for (int i = 0; i < sb.Length; i++)
-            {
-                if (sb[i] == sep)
-                {
-                    if (l >= i)
-                    {
-                        sOut[c] = "";
-                    }
-                    else
-                    {
-                        // TODO, check this
-                        sOut[c] = sb.ToString(l, i-l);
-                    }
-                    l = i + 1;
-                    c++;
-                }
-            }
-            if (l < sb.Length)
-            {
-                sOut[c] = sb.ToString(l, sb.Length - l);
-            }
-            return sOut;
-        }
-
-        internal static bool isCompatibilityMapping(string sIn)
-        {
-            return sIn.Length > 0 && sIn[0] == '<';
-        }
-
-        internal static string stripCompatibilityTag(string sIn)
-        {
-            return sIn.Substring(sIn.IndexOf('>') + 2);
-        }
-
-        internal static string toString(string sIn)
-        {
-            StringBuilder sOut = new StringBuilder();
-            string[] chars = split(sIn, ' ');
-            for (int i = 0; i < chars.Length; i++)
-            {
-                if (chars[i].Equals("005C"))
-                {
-                    sOut.Append("\\\\");
-                }
-                else if (chars[i].Equals("0022"))
-                {
-                    sOut.Append("\\\"");
-                }
-                else
-                {
-                    sOut.Append("\\u");
-                    sOut.Append(chars[i]);
-                }
-            }
-            return sOut.ToString();
-        }
-            
-        internal static string decompose(string sIn, SortedList mappings)
-        {
-            StringBuilder sOut = new StringBuilder();
-            string[] c = split(sIn, ' ');
-
-            for (int i = 0; i < c.Length; i++)
-            {
-                if (mappings.ContainsKey(c[i]))
-                {
-                    if (sOut.Length > 0)
-                    {
-                        sOut.Append(" ");
-                    }
-                    sOut.Append(decompose((string)mappings[c[i]], mappings));
-                }
-                else
-                {
-                    if (sOut.Length > 0)
-                    {
-                        sOut.Append(" ");
-                    }
-                    sOut.Append(c[i]);
-                }
-            }
-
-            return sOut.ToString();
-        }
-            
-        public static void Generate()
-        {
-            // Check if the unicode files exist
-            {
-                FileInfo f1 = new FileInfo("CompositionExclusions.txt");
-                FileInfo f2 = new FileInfo("UnicodeData.txt");
-                bool tmpBool;
-                if (File.Exists(f1.FullName))
-                    tmpBool = true;
-                else
-                    tmpBool = Directory.Exists(f1.FullName);
-                bool tmpBool2;
-                if (File.Exists(f2.FullName))
-                    tmpBool2 = true;
-                else
-                    tmpBool2 = Directory.Exists(f2.FullName);
-                if (!tmpBool || !tmpBool2)
-                {
-                    Console.WriteLine("Unable to find UnicodeData.txt or CompositionExclusions.txt.");
-                    Console.WriteLine("Please download the latest version of these file from:");
-                    Console.WriteLine("http://www.unicode.org/Public/UNIDATA/");
-                    System.Environment.Exit(1);
-                }
-            }
-                    
-            ArrayList exclusions = new ArrayList();
-            {            
-                StreamReader r = new StreamReader("CompositionExclusions.txt", System.Text.Encoding.Default);
-                string line;
-                while (null != (line = r.ReadLine()))
-                {
-                    line = stripComment(line);
-                    line = line.Trim();
-                    if (line.Length == 0)
-                    {
-                        // Empty line
-                    }
-                    else if (line.Length == 4)
-                    {
-                        exclusions.Add(line);
-                    }
-                    else
-                    {
-                        // Skip code points > 0xffff
-                    }
-                }
-                r.Close();
-            }
-
-            // Read UnicodeData
-            
-            SortedList canonical = new SortedList();        
-            SortedList compatibility = new SortedList();        
-            SortedList combiningClasses = new SortedList();
-            {        
-                StreamReader r = new StreamReader("UnicodeData.txt", Encoding.Default);
-                string line;
-                while (null != (line = r.ReadLine()))
-                {
-                    line = stripComment(line);
-                    line = line.Trim();
-
-                    if (line.Length == 0)
-                    {
-                        // Empty line
-                    }
-                    else
-                    {
-                        string[] f = split(line, ';');
-
-                        if (f[0].Length == 4)
-                        {
-                            if (!f[5].Equals(""))
-                            {
-                                if (isCompatibilityMapping(f[5]))
-                                {
-                                    compatibility[f[0]] = stripCompatibilityTag(f[5]);
-                                }
-                                else
-                                {
-                                    compatibility[f[0]] = f[5];
-                                    if (!exclusions.Contains(f[0]))
-                                    {
-                                        canonical[f[0]] = f[5];
-                                    }
-                                }
-                            }
-                            if (!f[3].Equals("0"))
-                            {
-                                //UPGRADE_TODO: Method 'java.lang.Integer.parseInt' was converted to 'System.Convert.ToInt32' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073'"
-                                combiningClasses[(int)System.Convert.ToInt32(f[0], 16)] = f[3];
-                            }
-                        }
-                        else
-                        {
-                            // Skip code points > 0xffff
-                        }
-                    }
-                }
-                r.Close();
-            }
-
-            // Recursively apply compatibility mappings
-            while (true)
-            {
-                bool replaced = false;
-                            
-                IEnumerator i = new HashSet(compatibility.Keys).GetEnumerator();            
-                while (i.MoveNext())
-                {                
-                    string k = (string)i.Current;
-                    string v = (string)compatibility[k];
-
-                    string d = decompose(v, compatibility);
-                    if (!d.Equals(v))
-                    {
-                        replaced = true;
-                        compatibility[k] = d;
-                    }
-                }
-
-                if (!replaced)
-                {
-                    break;
-                }
-            }
-
-            // Eliminate duplicate mappings        
-            SortedList compatibilityKeys = new SortedList();
-            ArrayList compatibilityMappings = new ArrayList();
-            {            
-                IEnumerator i = new HashSet(compatibility.Keys).GetEnumerator();            
-                while (i.MoveNext())
-                {                
-                    string k = (string)i.Current;
-                    string v = (string)compatibility[k];
-
-                    int index = compatibilityMappings.IndexOf(v);
-                    if (index == -1)
-                    {
-                        index = compatibilityMappings.Count;
-                        compatibilityMappings.Add(v);
-                    }
-                    compatibilityKeys[k] = (int)index;
-                }
-            }
-
-            // Create composition tables        
-            SortedList firstMap = new SortedList();        
-            SortedList secondMap = new SortedList();
-            {            
-                IEnumerator i = new HashSet(canonical.Keys).GetEnumerator();            
-                while (i.MoveNext())
-                {                
-                    string k = (string)i.Current;
-                    string v = (string)canonical[k];
-
-                    string[] s = split(v, ' ');
-
-                    if (s.Length == 2)
-                    {
-                        // If both characters have the same combining class, they
-                        // won't be combined (in the sequence AB, B is blocked from
-                        // A if both have the same combining class)                    
-                        string cc1 = (string)combiningClasses[(int)System.Convert.ToInt32(s[0], 16)];                    
-                        string cc2 = (string)combiningClasses[(int)System.Convert.ToInt32(s[1], 16)];
-                        if (cc1 != null || (cc1 != null && cc1.Equals(cc2)))
-                        {
-                            // Ignore this composition                        
-                            // TODO check this
-                            //i.remove();                        
-                            canonical.Remove(k);
-                            continue;
-                        }
-
-                        if (firstMap.ContainsKey(s[0]))
-                        {
-                            int c = (int)firstMap[s[0]];
-                            firstMap[s[0]] = (int)(c + 1);
-                        }
-                        else
-                        {
-                            firstMap[s[0]] = 1;
-                        }
-
-                        if (secondMap.ContainsKey(s[1]))
-                        {
-                            int c = (int)secondMap[s[1]];
-                            secondMap[s[1]] = (int)(c + 1);
-                        }
-                        else
-                        {
-                            secondMap[s[1]] = 1;
-                        }
-                    }
-                    else if (s.Length > 2)
-                    {
-                        Console.WriteLine("? wrong canonical mapping for " + k);
-                        System.Environment.Exit(1);
-                    }
-                }
-            }
-                    
-            SortedList singleFirstComposition = new SortedList();        
-            SortedList singleSecondComposition = new SortedList();        
-            SortedList complexComposition = new SortedList();
-
-            int composeLookupMax = 0;
-            {            
-                IEnumerator i = new HashSet(canonical.Keys).GetEnumerator();         
-                while (i.MoveNext())
-                {                
-                    string k = (string) i.Current;
-                    string v = (string) canonical[k];
-
-                    string[] s = split(v, ' ');
-
-                    if (s.Length == 2)
-                    {
-                        // TODO, check this
-                        int first = 0;
-                        if(firstMap.Contains(s[0]))
-                            first = (int) firstMap[s[0]];
-                        
-                        int second = 0;
-                        if (secondMap.Contains(s[1]))
-                            second = (int) secondMap[s[1]];
-                        // TODO, check this
-
-                        if (first == 1)
-                        {
-                            singleFirstComposition[s[0]] = new string[] { s[1], k };                        
-                            composeLookupMax = System.Math.Max(composeLookupMax, System.Convert.ToInt32(s[0], 16));
-                        }
-                        else if (second == 1)
-                        {
-                            singleSecondComposition[s[1]] = new string[] { s[0], k };                        
-                            composeLookupMax = System.Math.Max(composeLookupMax, System.Convert.ToInt32(s[1], 16));
-                        }
-                        else
-                        {
-                            if (complexComposition.ContainsKey(s[0]))
-                            {                            
-                                SortedList m = (SortedList)complexComposition[s[0]];
-                                if (m.ContainsKey(s[1]))
-                                {
-                                    Console.WriteLine("? ambiguous canonical mapping for " + s[0]);
-                                    System.Environment.Exit(1);
-                                }
-                                m[s[1]] = k;
-                            }
-                            else
-                            {                            
-                                SortedList m = new SortedList();
-                                m[s[1]] = k;
-                                complexComposition[s[0]] = m;
-                            }                        
-                            composeLookupMax = System.Math.Max(composeLookupMax, System.Convert.ToInt32(s[0], 16));                        
-                            composeLookupMax = System.Math.Max(composeLookupMax, System.Convert.ToInt32(s[1], 16));
-                        }
-                    }
-                }
-            }
-
-            Console.WriteLine("Generating CombiningClass.cs file...");
-
-            // Dump combining classes
-            {
-                StreamWriter w = new StreamWriter("CombiningClass.cs", false, Encoding.Default);
-                w.WriteLine("// Do not edit !!!");
-                w.WriteLine("// this file is generated automatically");
-                w.WriteLine();            
-                w.WriteLine("public class CombiningClass");            
-                w.WriteLine("{");            
-                w.WriteLine("\tpublic static readonly int[,] c = new int[,] {");
-                System.Text.StringBuilder index = new System.Text.StringBuilder();
-
-                int count = 0;
-
-                for (int i = 0; i < 256; i++)
-                {
-                    bool empty = true;
-
-                    StringBuilder page = new StringBuilder();
-                    page.Append("    { /* Page " + i + " */");
-
-                    for (int j = 0; j < 256; j++)
-                    {
-                        int c = (int)((i << 8) + j);
-                        string cc = (string)combiningClasses[c];
-
-                        if (0 == (j & 31))
-                        {
-                            page.Append("\r\n      ");
-                        }
-                        if (cc == null)
-                        {
-                            page.Append("0, ");
-                        }
-                        else
-                        {
-                            page.Append(cc + ", ");
-                            empty = false;
-                        }
-                    }
-                    page.Append("\r\n    },");
-
-                    index.Append("    ");
-
-                    if (!empty)
-                    {                    
-                        w.WriteLine(page.ToString());
-                        index.Append(count++);
-                        index.Append(",\r\n");
-                    }
-                    else
-                    {
-                        index.Append("-1,\r\n");
-                    }
-                }            
-                w.WriteLine("  };\r\n");
-                            
-                w.WriteLine("\tpublic static readonly int[] i = new int[] {");
-                w.Write(index.ToString());            
-                w.WriteLine("  };");            
-                w.WriteLine("}");            
-                w.Close();
-            }
-
-            //Console.WriteLine(" Ok.");
-            Console.WriteLine("Generating DecompositionKeys.cs file...");
-
-            // Dump compatibility decomposition
-            {
-                StreamWriter w = new StreamWriter("DecompositionKeys.cs", false, Encoding.Default);
-                w.WriteLine("// Do not edit !!!");
-                w.WriteLine("// this file is generated automatically");         
-                w.WriteLine();            
-                w.WriteLine("public class DecompositionKeys");            
-                w.WriteLine("{");
-
-                w.WriteLine("\tpublic static readonly int[] k = new int[] {");            
-                IEnumerator i = new HashSet(compatibilityKeys.Keys).GetEnumerator();            
-                while (i.MoveNext())
-                {            
-                    string k = (string)i.Current;
-                    int index = ((int)compatibilityKeys[k]);             
-                    w.WriteLine("    '\\u" + k + "', " + index + ",");
-                }            
-                w.WriteLine("  };");            
-                w.WriteLine("}");            
-                w.Close();
-            }
-
-            //Console.WriteLine(" Ok.");
-            Console.WriteLine("Generating DecompositionMappings.cs file...");
-
-            {
-                StreamWriter w = new StreamWriter("DecompositionMappings.cs", false, Encoding.Default);
-                w.WriteLine("// Do not edit !!!");
-                w.WriteLine("// this file is generated automatically");
-                w.WriteLine();            
-                w.WriteLine("public class DecompositionMappings");            
-                w.WriteLine("{");            
-                w.WriteLine("\tpublic static readonly string[] m = new string[] {");
-                IEnumerator i = compatibilityMappings.GetEnumerator();
-                while (i.MoveNext())
-                {                
-                    string m = (string)i.Current;             
-                    w.WriteLine("    \"" + toString(m) + "\",");
-                }            
-                w.WriteLine("  };");            
-                w.WriteLine("}");            
-                w.Close();
-            }
-
-            //Console.WriteLine(" Ok.");
-            Console.WriteLine("Generating Composition.cs file...");
-
-            // Dump canonical composition
-            {
-                StreamWriter w = new StreamWriter("Composition.cs", false, Encoding.Default);
-                w.WriteLine("// Do not edit !!!");
-                w.WriteLine("// this file is generated automatically");
-                w.WriteLine();            
-                w.WriteLine("public class Composition");            
-                w.WriteLine("{");
-
-                IEnumerator i;
-                int index = 0;
-                           
-                SortedList indices = new SortedList();
-                            
-                i = new HashSet(complexComposition.Keys).GetEnumerator();            
-                while (i.MoveNext())
-                {                
-                    string s0 = (string)i.Current;             
-                    indices[(int)System.Convert.ToInt32(s0, 16)] = (int)index;
-                    index++;
-                }
-
-                int multiSecondStart = index;
-                w.WriteLine("\t/* jagged Array */");
-                w.WriteLine("\tpublic static readonly char[][] multiFirst = new char[][] {");
-                //w.WriteLine("  public final static char[][] multiFirst = new char[][] {");
-                i = new HashSet(complexComposition.Keys).GetEnumerator();            
-                while (i.MoveNext())
-                {                
-                    string s0 = (string)i.Current;             
-                    SortedList m = (SortedList)complexComposition[s0];
-                                   
-                    SortedList line = new SortedList();
-                    int maxIndex = 1;
-                                    
-                    System.Collections.IEnumerator i2 = new HashSet(m.Keys).GetEnumerator();                
-                    while (i2.MoveNext())
-                    {                    
-                        string s1 = (string)i2.Current;
-                        string k = (string)m[s1];
-                                         
-                        int s1i = (int)System.Convert.ToInt32(s1, 16);
-
-                        if (!indices.ContainsKey(s1i))
-                        {
-                            indices[s1i] = (int)index;
-                            index++;
-                        }
-                        line[indices[s1i]] = k;
-                        maxIndex = System.Math.Max(maxIndex, ((int)indices[s1i]));
-                    }
-
-                    w.Write("\tnew char[] { ");
-                    for (int j = multiSecondStart; j <= maxIndex; j++)
-                    {
-                        if (line.ContainsKey((int)j))
-                        {
-                            string s = (string)line[(int)j];
-                            w.Write("'" + toString(s) + "', ");
-                        }
-                        else
-                        {
-                            //w.Write("       0, ");
-                            w.Write("'" + toString("0000") + "', ");
-                        }
-                    }                
-                    w.WriteLine("},");
-                }            
-                w.WriteLine("  };");
-
-                int singleFirstStart = index;
-
-                w.WriteLine("\tpublic static readonly char[,] singleFirst = new char[,] {");
-                i = new HashSet(singleFirstComposition.Keys).GetEnumerator();            
-                while (i.MoveNext())
-                {            
-                    string k = (string)i.Current;
-                    string[] v = ((string[])singleFirstComposition[k]);             
-                    w.WriteLine("    { '" + toString(v[0]) + "', '" + toString(v[1]) + "' },");
-                                    
-                    if (indices.ContainsKey((int)System.Convert.ToInt32(k, 16)))
-                    {
-                        Console.WriteLine(k + " already indexed!");
-                    }
-                                    
-                    indices[(int)System.Convert.ToInt32(k, 16)] = (int)index;
-                    index++;
-                }            
-                w.WriteLine("  };");
-
-                int singleSecondStart = index;
-                            
-                w.WriteLine("\tpublic static readonly char[,] singleSecond = new char[,] {");
-                i = new HashSet(singleSecondComposition.Keys).GetEnumerator();            
-                while (i.MoveNext())
-                {                
-                    string k = (string)i.Current;
-                    string[] v = ((string[])singleSecondComposition[k]);             
-                    w.WriteLine("    { '" + toString(v[0]) + "', '" + toString(v[1]) + "' },");
-                                    
-                    indices[(int)System.Convert.ToInt32(k, 16)] = (int)index;
-                    index++;
-                }            
-                w.WriteLine("  };");
-                            
-                w.WriteLine("\tpublic static readonly int multiSecondStart = " + multiSecondStart + ";");            
-                w.WriteLine("\tpublic static readonly int singleFirstStart = " + singleFirstStart + ";");            
-                w.WriteLine("\tpublic static readonly int singleSecondStart = " + singleSecondStart + ";");
-
-                System.Text.StringBuilder compositionPages = new System.Text.StringBuilder();
-                            
-                w.WriteLine("\tpublic static readonly int[] composePage = new int[] {");
-                int pageCount = 0;
-                for (int j = 0; j * 256 < composeLookupMax + 255; j++)
-                {
-                    bool empty = true;
-                    StringBuilder page = new StringBuilder();
-                    for (int k = 0; k < 256; k++)
-                    {
-                        if (k % 16 == 0)
-                        {
-                            page.Append("\r\n      ");
-                        }
-                        if (indices.ContainsKey((int)(j * 256 + k)))
-                        {
-                            page.Append(indices[(int)(j * 256 + k)]);
-                            page.Append(", ");
-                            empty = false;
-                        }
-                        else
-                        {
-                            page.Append("-1, ");
-                        }
-                    }
-
-                    if (empty)
-                    {                    
-                        w.WriteLine("    -1,");
-                    }
-                    else
-                    {                 
-                        w.WriteLine("    " + pageCount + ",");
-                        compositionPages.Append("\t{");
-                        compositionPages.Append(page);
-                        compositionPages.Append("\r\n    },\r\n");
-                        pageCount++;
-                    }
-                }            
-                w.WriteLine("  };");
-                //w.WriteLine("\t/* jagged Array */");                        
-                w.WriteLine("\tpublic static readonly int[,] composeData = new int[,] {");
-                w.Write(compositionPages);            
-                w.WriteLine("  };");                        
-                w.WriteLine("}");            
-                w.Close();
-            }
-
-            //Console.WriteLine(" Ok.");             
-            Console.WriteLine("Finished!");
-        }
-    }
-}
+/// <summary>
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
+///
+/// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
+///
+/// This file is part of GNU Libidn.
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
+/// </summary>
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Text;
+
+namespace gnu.inet.encoding.misc
+{
+    public class GenerateNFKC
+    {
+        internal static string stripComment(string sIn)
+        {
+            int c = sIn.IndexOf('#');
+            if (c == -1)
+            {
+                return sIn;
+            }
+            else
+            {
+                return sIn.Substring(0, (c) - (0));
+            }
+        }
+
+        internal static string[] split(string sIn, char sep)
+        {
+            StringBuilder sb = new StringBuilder(sIn);
+            int c = 0;
+            for (int i = 0; i < sb.Length; i++)
+            {
+                if (sb[i] == sep)
+                {
+                    c++;
+                }
+            }
+
+            string[] sOut = new string[c + 1];
+            c = 0;
+            int l = 0;
+            for (int i = 0; i < sb.Length; i++)
+            {
+                if (sb[i] == sep)
+                {
+                    if (l >= i)
+                    {
+                        sOut[c] = "";
+                    }
+                    else
+                    {
+                        // TODO, check this
+                        sOut[c] = sb.ToString(l, i-l);
+                    }
+                    l = i + 1;
+                    c++;
+                }
+            }
+            if (l < sb.Length)
+            {
+                sOut[c] = sb.ToString(l, sb.Length - l);
+            }
+            return sOut;
+        }
+
+        internal static bool isCompatibilityMapping(string sIn)
+        {
+            return sIn.Length > 0 && sIn[0] == '<';
+        }
+
+        internal static string stripCompatibilityTag(string sIn)
+        {
+            return sIn.Substring(sIn.IndexOf('>') + 2);
+        }
+
+        internal static string toString(string sIn)
+        {
+            StringBuilder sOut = new StringBuilder();
+            string[] chars = split(sIn, ' ');
+            for (int i = 0; i < chars.Length; i++)
+            {
+                if (chars[i].Equals("005C"))
+                {
+                    sOut.Append("\\\\");
+                }
+                else if (chars[i].Equals("0022"))
+                {
+                    sOut.Append("\\\"");
+                }
+                else
+                {
+                    sOut.Append("\\u");
+                    sOut.Append(chars[i]);
+                }
+            }
+            return sOut.ToString();
+        }
+
+        internal static string decompose(string sIn, SortedList mappings)
+        {
+            StringBuilder sOut = new StringBuilder();
+            string[] c = split(sIn, ' ');
+
+            for (int i = 0; i < c.Length; i++)
+            {
+                if (mappings.ContainsKey(c[i]))
+                {
+                    if (sOut.Length > 0)
+                    {
+                        sOut.Append(" ");
+                    }
+                    sOut.Append(decompose((string)mappings[c[i]], mappings));
+                }
+                else
+                {
+                    if (sOut.Length > 0)
+                    {
+                        sOut.Append(" ");
+                    }
+                    sOut.Append(c[i]);
+                }
+            }
+
+            return sOut.ToString();
+        }
+
+        public static void Generate()
+        {
+            // Check if the unicode files exist
+            {
+                FileInfo f1 = new FileInfo("CompositionExclusions.txt");
+                FileInfo f2 = new FileInfo("UnicodeData.txt");
+                bool tmpBool;
+                if (File.Exists(f1.FullName))
+                    tmpBool = true;
+                else
+                    tmpBool = Directory.Exists(f1.FullName);
+                bool tmpBool2;
+                if (File.Exists(f2.FullName))
+                    tmpBool2 = true;
+                else
+                    tmpBool2 = Directory.Exists(f2.FullName);
+                if (!tmpBool || !tmpBool2)
+                {
+                    Console.WriteLine("Unable to find UnicodeData.txt or CompositionExclusions.txt.");
+                    Console.WriteLine("Please download the latest version of these file from:");
+                    Console.WriteLine("http://www.unicode.org/Public/UNIDATA/");
+                    System.Environment.Exit(1);
+                }
+            }
+
+            ArrayList exclusions = new ArrayList();
+            {
+                StreamReader r = new StreamReader("CompositionExclusions.txt", System.Text.Encoding.Default);
+                string line;
+                while (null != (line = r.ReadLine()))
+                {
+                    line = stripComment(line);
+                    line = line.Trim();
+                    if (line.Length == 0)
+                    {
+                        // Empty line
+                    }
+                    else if (line.Length == 4)
+                    {
+                        exclusions.Add(line);
+                    }
+                    else
+                    {
+                        // Skip code points > 0xffff
+                    }
+                }
+                r.Close();
+            }
+
+            // Read UnicodeData
+
+            SortedList canonical = new SortedList();
+            SortedList compatibility = new SortedList();
+            SortedList combiningClasses = new SortedList();
+            {
+                StreamReader r = new StreamReader("UnicodeData.txt", Encoding.Default);
+                string line;
+                while (null != (line = r.ReadLine()))
+                {
+                    line = stripComment(line);
+                    line = line.Trim();
+
+                    if (line.Length == 0)
+                    {
+                        // Empty line
+                    }
+                    else
+                    {
+                        string[] f = split(line, ';');
+
+                        if (f[0].Length == 4)
+                        {
+                            if (!f[5].Equals(""))
+                            {
+                                if (isCompatibilityMapping(f[5]))
+                                {
+                                    compatibility[f[0]] = stripCompatibilityTag(f[5]);
+                                }
+                                else
+                                {
+                                    compatibility[f[0]] = f[5];
+                                    if (!exclusions.Contains(f[0]))
+                                    {
+                                        canonical[f[0]] = f[5];
+                                    }
+                                }
+                            }
+                            if (!f[3].Equals("0"))
+                            {
+                                //UPGRADE_TODO: Method 'java.lang.Integer.parseInt' was converted to 'System.Convert.ToInt32' which has a different behavior. "ms-help://MS.VSCC.v80/dv_commoner/local/redirect.htm?index='!DefaultContextWindowIndex'&keyword='jlca1073'"
+                                combiningClasses[(int)System.Convert.ToInt32(f[0], 16)] = f[3];
+                            }
+                        }
+                        else
+                        {
+                            // Skip code points > 0xffff
+                        }
+                    }
+                }
+                r.Close();
+            }
+
+            // Recursively apply compatibility mappings
+            while (true)
+            {
+                bool replaced = false;
+
+                IEnumerator i = new HashSet(compatibility.Keys).GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string k = (string)i.Current;
+                    string v = (string)compatibility[k];
+
+                    string d = decompose(v, compatibility);
+                    if (!d.Equals(v))
+                    {
+                        replaced = true;
+                        compatibility[k] = d;
+                    }
+                }
+
+                if (!replaced)
+                {
+                    break;
+                }
+            }
+
+            // Eliminate duplicate mappings
+            SortedList compatibilityKeys = new SortedList();
+            ArrayList compatibilityMappings = new ArrayList();
+            {
+                IEnumerator i = new HashSet(compatibility.Keys).GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string k = (string)i.Current;
+                    string v = (string)compatibility[k];
+
+                    int index = compatibilityMappings.IndexOf(v);
+                    if (index == -1)
+                    {
+                        index = compatibilityMappings.Count;
+                        compatibilityMappings.Add(v);
+                    }
+                    compatibilityKeys[k] = (int)index;
+                }
+            }
+
+            // Create composition tables
+            SortedList firstMap = new SortedList();
+            SortedList secondMap = new SortedList();
+            {
+                IEnumerator i = new HashSet(canonical.Keys).GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string k = (string)i.Current;
+                    string v = (string)canonical[k];
+
+                    string[] s = split(v, ' ');
+
+                    if (s.Length == 2)
+                    {
+                        // If both characters have the same combining class, they
+                        // won't be combined (in the sequence AB, B is blocked from
+                        // A if both have the same combining class)
+                        string cc1 = (string)combiningClasses[(int)System.Convert.ToInt32(s[0], 16)];
+                        string cc2 = (string)combiningClasses[(int)System.Convert.ToInt32(s[1], 16)];
+                        if (cc1 != null || (cc1 != null && cc1.Equals(cc2)))
+                        {
+                            // Ignore this composition
+                            // TODO check this
+                            //i.remove();
+                            canonical.Remove(k);
+                            continue;
+                        }
+
+                        if (firstMap.ContainsKey(s[0]))
+                        {
+                            int c = (int)firstMap[s[0]];
+                            firstMap[s[0]] = (int)(c + 1);
+                        }
+                        else
+                        {
+                            firstMap[s[0]] = 1;
+                        }
+
+                        if (secondMap.ContainsKey(s[1]))
+                        {
+                            int c = (int)secondMap[s[1]];
+                            secondMap[s[1]] = (int)(c + 1);
+                        }
+                        else
+                        {
+                            secondMap[s[1]] = 1;
+                        }
+                    }
+                    else if (s.Length > 2)
+                    {
+                        Console.WriteLine("? wrong canonical mapping for " + k);
+                        System.Environment.Exit(1);
+                    }
+                }
+            }
+
+            SortedList singleFirstComposition = new SortedList();
+            SortedList singleSecondComposition = new SortedList();
+            SortedList complexComposition = new SortedList();
+
+            int composeLookupMax = 0;
+            {
+                IEnumerator i = new HashSet(canonical.Keys).GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string k = (string) i.Current;
+                    string v = (string) canonical[k];
+
+                    string[] s = split(v, ' ');
+
+                    if (s.Length == 2)
+                    {
+                        // TODO, check this
+                        int first = 0;
+                        if(firstMap.Contains(s[0]))
+                            first = (int) firstMap[s[0]];
+
+                        int second = 0;
+                        if (secondMap.Contains(s[1]))
+                            second = (int) secondMap[s[1]];
+                        // TODO, check this
+
+                        if (first == 1)
+                        {
+                            singleFirstComposition[s[0]] = new string[] { s[1], k };
+                            composeLookupMax = System.Math.Max(composeLookupMax, System.Convert.ToInt32(s[0], 16));
+                        }
+                        else if (second == 1)
+                        {
+                            singleSecondComposition[s[1]] = new string[] { s[0], k };
+                            composeLookupMax = System.Math.Max(composeLookupMax, System.Convert.ToInt32(s[1], 16));
+                        }
+                        else
+                        {
+                            if (complexComposition.ContainsKey(s[0]))
+                            {
+                                SortedList m = (SortedList)complexComposition[s[0]];
+                                if (m.ContainsKey(s[1]))
+                                {
+                                    Console.WriteLine("? ambiguous canonical mapping for " + s[0]);
+                                    System.Environment.Exit(1);
+                                }
+                                m[s[1]] = k;
+                            }
+                            else
+                            {
+                                SortedList m = new SortedList();
+                                m[s[1]] = k;
+                                complexComposition[s[0]] = m;
+                            }
+                            composeLookupMax = System.Math.Max(composeLookupMax, System.Convert.ToInt32(s[0], 16));
+                            composeLookupMax = System.Math.Max(composeLookupMax, System.Convert.ToInt32(s[1], 16));
+                        }
+                    }
+                }
+            }
+
+            Console.WriteLine("Generating CombiningClass.cs file...");
+
+            // Dump combining classes
+            {
+                StreamWriter w = new StreamWriter("CombiningClass.cs", false, Encoding.Default);
+                w.WriteLine("// Do not edit !!!");
+                w.WriteLine("// this file is generated automatically");
+                w.WriteLine();
+                w.WriteLine("public class CombiningClass");
+                w.WriteLine("{");
+                w.WriteLine("\tpublic static readonly int[,] c = new int[,] {");
+                System.Text.StringBuilder index = new System.Text.StringBuilder();
+
+                int count = 0;
+
+                for (int i = 0; i < 256; i++)
+                {
+                    bool empty = true;
+
+                    StringBuilder page = new StringBuilder();
+                    page.Append("    { /* Page " + i + " */");
+
+                    for (int j = 0; j < 256; j++)
+                    {
+                        int c = (int)((i << 8) + j);
+                        string cc = (string)combiningClasses[c];
+
+                        if (0 == (j & 31))
+                        {
+                            page.Append("\r\n      ");
+                        }
+                        if (cc == null)
+                        {
+                            page.Append("0, ");
+                        }
+                        else
+                        {
+                            page.Append(cc + ", ");
+                            empty = false;
+                        }
+                    }
+                    page.Append("\r\n    },");
+
+                    index.Append("    ");
+
+                    if (!empty)
+                    {
+                        w.WriteLine(page.ToString());
+                        index.Append(count++);
+                        index.Append(",\r\n");
+                    }
+                    else
+                    {
+                        index.Append("-1,\r\n");
+                    }
+                }
+                w.WriteLine("  };\r\n");
+
+                w.WriteLine("\tpublic static readonly int[] i = new int[] {");
+                w.Write(index.ToString());
+                w.WriteLine("  };");
+                w.WriteLine("}");
+                w.Close();
+            }
+
+            //Console.WriteLine(" Ok.");
+            Console.WriteLine("Generating DecompositionKeys.cs file...");
+
+            // Dump compatibility decomposition
+            {
+                StreamWriter w = new StreamWriter("DecompositionKeys.cs", false, Encoding.Default);
+                w.WriteLine("// Do not edit !!!");
+                w.WriteLine("// this file is generated automatically");
+                w.WriteLine();
+                w.WriteLine("public class DecompositionKeys");
+                w.WriteLine("{");
+
+                w.WriteLine("\tpublic static readonly int[] k = new int[] {");
+                IEnumerator i = new HashSet(compatibilityKeys.Keys).GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string k = (string)i.Current;
+                    int index = ((int)compatibilityKeys[k]);
+                    w.WriteLine("    '\\u" + k + "', " + index + ",");
+                }
+                w.WriteLine("  };");
+                w.WriteLine("}");
+                w.Close();
+            }
+
+            //Console.WriteLine(" Ok.");
+            Console.WriteLine("Generating DecompositionMappings.cs file...");
+
+            {
+                StreamWriter w = new StreamWriter("DecompositionMappings.cs", false, Encoding.Default);
+                w.WriteLine("// Do not edit !!!");
+                w.WriteLine("// this file is generated automatically");
+                w.WriteLine();
+                w.WriteLine("public class DecompositionMappings");
+                w.WriteLine("{");
+                w.WriteLine("\tpublic static readonly string[] m = new string[] {");
+                IEnumerator i = compatibilityMappings.GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string m = (string)i.Current;
+                    w.WriteLine("    \"" + toString(m) + "\",");
+                }
+                w.WriteLine("  };");
+                w.WriteLine("}");
+                w.Close();
+            }
+
+            //Console.WriteLine(" Ok.");
+            Console.WriteLine("Generating Composition.cs file...");
+
+            // Dump canonical composition
+            {
+                StreamWriter w = new StreamWriter("Composition.cs", false, Encoding.Default);
+                w.WriteLine("// Do not edit !!!");
+                w.WriteLine("// this file is generated automatically");
+                w.WriteLine();
+                w.WriteLine("public class Composition");
+                w.WriteLine("{");
+
+                IEnumerator i;
+                int index = 0;
+
+                SortedList indices = new SortedList();
+
+                i = new HashSet(complexComposition.Keys).GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string s0 = (string)i.Current;
+                    indices[(int)System.Convert.ToInt32(s0, 16)] = (int)index;
+                    index++;
+                }
+
+                int multiSecondStart = index;
+                w.WriteLine("\t/* jagged Array */");
+                w.WriteLine("\tpublic static readonly char[][] multiFirst = new char[][] {");
+                //w.WriteLine("  public final static char[][] multiFirst = new char[][] {");
+                i = new HashSet(complexComposition.Keys).GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string s0 = (string)i.Current;
+                    SortedList m = (SortedList)complexComposition[s0];
+
+                    SortedList line = new SortedList();
+                    int maxIndex = 1;
+
+                    System.Collections.IEnumerator i2 = new HashSet(m.Keys).GetEnumerator();
+                    while (i2.MoveNext())
+                    {
+                        string s1 = (string)i2.Current;
+                        string k = (string)m[s1];
+
+                        int s1i = (int)System.Convert.ToInt32(s1, 16);
+
+                        if (!indices.ContainsKey(s1i))
+                        {
+                            indices[s1i] = (int)index;
+                            index++;
+                        }
+                        line[indices[s1i]] = k;
+                        maxIndex = System.Math.Max(maxIndex, ((int)indices[s1i]));
+                    }
+
+                    w.Write("\tnew char[] { ");
+                    for (int j = multiSecondStart; j <= maxIndex; j++)
+                    {
+                        if (line.ContainsKey((int)j))
+                        {
+                            string s = (string)line[(int)j];
+                            w.Write("'" + toString(s) + "', ");
+                        }
+                        else
+                        {
+                            //w.Write("       0, ");
+                            w.Write("'" + toString("0000") + "', ");
+                        }
+                    }
+                    w.WriteLine("},");
+                }
+                w.WriteLine("  };");
+
+                int singleFirstStart = index;
+
+                w.WriteLine("\tpublic static readonly char[,] singleFirst = new char[,] {");
+                i = new HashSet(singleFirstComposition.Keys).GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string k = (string)i.Current;
+                    string[] v = ((string[])singleFirstComposition[k]);
+                    w.WriteLine("    { '" + toString(v[0]) + "', '" + toString(v[1]) + "' },");
+
+                    if (indices.ContainsKey((int)System.Convert.ToInt32(k, 16)))
+                    {
+                        Console.WriteLine(k + " already indexed!");
+                    }
+
+                    indices[(int)System.Convert.ToInt32(k, 16)] = (int)index;
+                    index++;
+                }
+                w.WriteLine("  };");
+
+                int singleSecondStart = index;
+
+                w.WriteLine("\tpublic static readonly char[,] singleSecond = new char[,] {");
+                i = new HashSet(singleSecondComposition.Keys).GetEnumerator();
+                while (i.MoveNext())
+                {
+                    string k = (string)i.Current;
+                    string[] v = ((string[])singleSecondComposition[k]);
+                    w.WriteLine("    { '" + toString(v[0]) + "', '" + toString(v[1]) + "' },");
+
+                    indices[(int)System.Convert.ToInt32(k, 16)] = (int)index;
+                    index++;
+                }
+                w.WriteLine("  };");
+
+                w.WriteLine("\tpublic static readonly int multiSecondStart = " + multiSecondStart + ";");
+                w.WriteLine("\tpublic static readonly int singleFirstStart = " + singleFirstStart + ";");
+                w.WriteLine("\tpublic static readonly int singleSecondStart = " + singleSecondStart + ";");
+
+                System.Text.StringBuilder compositionPages = new System.Text.StringBuilder();
+
+                w.WriteLine("\tpublic static readonly int[] composePage = new int[] {");
+                int pageCount = 0;
+                for (int j = 0; j * 256 < composeLookupMax + 255; j++)
+                {
+                    bool empty = true;
+                    StringBuilder page = new StringBuilder();
+                    for (int k = 0; k < 256; k++)
+                    {
+                        if (k % 16 == 0)
+                        {
+                            page.Append("\r\n      ");
+                        }
+                        if (indices.ContainsKey((int)(j * 256 + k)))
+                        {
+                            page.Append(indices[(int)(j * 256 + k)]);
+                            page.Append(", ");
+                            empty = false;
+                        }
+                        else
+                        {
+                            page.Append("-1, ");
+                        }
+                    }
+
+                    if (empty)
+                    {
+                        w.WriteLine("    -1,");
+                    }
+                    else
+                    {
+                        w.WriteLine("    " + pageCount + ",");
+                        compositionPages.Append("\t{");
+                        compositionPages.Append(page);
+                        compositionPages.Append("\r\n    },\r\n");
+                        pageCount++;
+                    }
+                }
+                w.WriteLine("  };");
+                //w.WriteLine("\t/* jagged Array */");
+                w.WriteLine("\tpublic static readonly int[,] composeData = new int[,] {");
+                w.Write(compositionPages);
+                w.WriteLine("  };");
+                w.WriteLine("}");
+                w.Close();
+            }
+
+            //Console.WriteLine(" Ok.");
+            Console.WriteLine("Finished!");
+        }
+    }
+}
diff --git a/csharp/generate/GenerateRFC3454.cs b/csharp/generate/GenerateRFC3454.cs
index 60696a9..dffab70 100644
--- a/csharp/generate/GenerateRFC3454.cs
+++ b/csharp/generate/GenerateRFC3454.cs
@@ -1,294 +1,304 @@
-/// <summary>
-/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
-/// Author: Alexander Gnauck AG-Software
-/// *
-/// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
-/// </summary>
-using System;
-using System.IO;
-using System.Text;
-
-namespace gnu.inet.encoding.misc
-{
-    public class GenerateRFC3454
-    {
-        internal const string FILE_RFC3454  = "rfc3454.txt";
-        internal const string FILE_OUTPUT   = "RFC3454.cs";
-                
-        public static void Generate()
-        {
-            if (!File.Exists(FILE_RFC3454))
-            {
-                Console.WriteLine("Unable to find rfc3454.txt.");
-                Console.WriteLine("Please download this file from:");
-                Console.WriteLine("http://www.ietf.org/rfc/rfc3454.txt");
-                
-                return;                
-            }
-
-            Console.WriteLine("Generating " + FILE_OUTPUT + " file...");
-                        
-            
-            StreamReader r = new StreamReader(FILE_RFC3454);            
-            StreamWriter w = new StreamWriter(FILE_OUTPUT);
-
-            w.WriteLine("// Do not edit !!!");
-            w.WriteLine("// this file is generated automatically");
-            w.WriteLine();
-            w.WriteLine("using System;");
-            w.WriteLine();
-            w.WriteLine("namespace Gnu.Inet.Encoding{");
-            w.WriteLine();
-            w.WriteLine("public class RFC3454");
-
-            w.WriteLine("{");
-
-            int n = 0;
-
-            string t = null;
-            System.Text.StringBuilder o1 = null;
-            System.Text.StringBuilder o2 = null;
-
-            while (true)
-            {
-                string line = r.ReadLine();
-                string l = line;
-                
-                if (null == l)
-                {
-                    break;
-                }
-                l = l.Trim();
-
-                if (l.Equals(""))
-                {
-                    // Ignore empty line
-                }
-                else if (-1 != l.IndexOf("\u000c"))
-                {
-                    // Ignore FF
-                }
-                else if (0 == l.IndexOf("RFC"))
-                {
-                    // Ignore page header
-                }
-                else if (0 == l.IndexOf("Hoffman & Blanchet"))
-                {
-                    // Ignore page footer
-                }
-                else if (-1 != l.IndexOf("----- Start Table "))
-                {
-                    // Start of a table
-                    t = l.Substring(l.IndexOf("Table") + 6, (l.LastIndexOf("-----") - 1) - (l.IndexOf("Table") + 6));
-                    o1 = new System.Text.StringBuilder();
-                    o2 = new System.Text.StringBuilder();
-                }
-                else if (-1 != l.IndexOf("----- End Table "))
-                {
-                    // End of a table
-                    if ("A.1".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] A1 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("B.1".Equals(t))
-                    {
-                        w.WriteLine("  public static char[] B1 = new char[] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("B.2".Equals(t))
-                    {
-                        w.WriteLine("  public static char[] B2search = new char[] {\r\n" + o1.ToString() + "  };\r\n");
-                        w.WriteLine("  public static string[] B2replace = new string[] {\r\n" + o2.ToString() + "  };\r\n");
-                    }
-                    else if ("B.3".Equals(t))
-                    {
-                        w.WriteLine("  public static char[] B3search = new char[] {\r\n" + o1.ToString() + "  };\r\n");
-                        w.WriteLine("  public static string[] B3replace = new string[] {\r\n" + o2.ToString() + "  };\r\n");
-                    }
-                    else if ("C.1.1".Equals(t))
-                    {
-                        w.WriteLine("  public static char[] C11 = new char[] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("C.1.2".Equals(t))
-                    {
-                        w.WriteLine("  public static char[] C12 = new char[] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("C.2.1".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] C21 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("C.2.2".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] C22 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("C.3".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] C3 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("C.4".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] C4 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("C.5".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] C5 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("C.6".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] C6 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("C.7".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] C7 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("C.8".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] C8 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("D.1".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] D1 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    else if ("D.2".Equals(t))
-                    {
-                        w.WriteLine("  public static char[][] D2 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
-                    }
-                    t = null;
-                }
-                else if (null != t)
-                {
-                    // Filter comments
-                    if (-1 != l.LastIndexOf(";"))
-                    {
-                        string c = l.Substring(l.LastIndexOf(";")).Trim();
-                        try
-                        {                            
-                           Convert.ToInt32(c, 16);
-                        }
-                        catch
-                        {
-                            l = l.Substring(0, (l.LastIndexOf(";")) - (0));
-                        }
-                    }
-
-                    if ("A.1".Equals(t))
-                    {
-                        if (4 == l.Length)
-                        {
-                            o1.Append("    new char[] { '\\u");
-                            o1.Append(l);
-                            o1.Append("' },");
-                            o1.Append("\t/* " + line.Trim() + " */\r\n");
-                        }
-                        else if (5 == l.Length)
-                        {
-                            //Char
-                            o1.Append("\t/* Skip characters outside the range of .NET unicode " + line.Trim() + " */\n");
-                            //Console.WriteLine("Skip: " + l);                            
-                            // Skip characters outside the range of Java unicode
-                        }
-                        else if (9 == l.Length)
-                        {
-                            o1.Append("    new char[] { '\\u");
-                            o1.Append(l.Substring(0, (4) - (0)));
-                            o1.Append("', '\\u");
-                            o1.Append(l.Substring(5, (9) - (5)));
-                            o1.Append("' },");
-                            o1.Append("\t/* " + line.Trim() + " */\r\n");
-                        }
-                        else if (11 == l.Length)
-                        {
-                            o1.Append("\t/* Skip characters outside the range of .NET unicode " + line.Trim() + " */\n");
-                            //o1.AppendLine("// " + l);
-                            // Console.WriteLine("Skip: " + l);
-                            // Skip characters outside the range of Java unicode
-                        }
-                        else
-                        {
-                            Console.WriteLine("Unknown format of A.1 line: " + l);
-                        }
-                    }
-                    else if ("B.1".Equals(t))
-                    {
-                        Tokenizer tok = new Tokenizer(l, " ;");
-                        o1.Append("    '\\u" + tok.NextToken() + "',");
-                        o1.Append("\t/* " + line.Trim() + " */\r\n");
-                    }
-                    else if ("B.2".Equals(t) || "B.3".Equals(t))
-                    {
-                        Tokenizer tok = new Tokenizer(l, "; ");
-                        string c = tok.NextToken();
-                        if (c.Length == 4)
-                        {
-                            o1.Append("    '\\u" + c + "',");
-                            o1.Append("\t/*" + line.Trim() + "*/\r\n");
-                            if (tok.HasMoreTokens())
-                            {
-                                o2.Append("    \"");
-                                while (tok.HasMoreTokens())
-                                {
-                                    o2.Append("\\u" + tok.NextToken());
-                                }
-                                o2.Append("\",");
-                                o2.Append("\t/*" + line.Trim() + "*/\r\n");
-                            }
-                            else
-                            {
-                                o2.Append("    null,");
-                                o2.Append("\t/*" + line.Trim() + "*/\r\n");
-                            }
-                        }
-                    }
-                    else if ("C.1.1".Equals(t))
-                    {
-                        o1.Append("    '\\u" + l + "',");
-                        o1.Append("\t/* " + line.Trim() + " */\r\n");
-                    }
-                    else if ("C.1.2".Equals(t))
-                    {
-                        o1.Append("    '\\u" + l + "',");
-                        o1.Append("\t/* " + line.Trim() + " */\r\n");
-                    }
-                    else if ("C.2.1".Equals(t) || "C.2.2".Equals(t) || "C.3".Equals(t) || "C.4".Equals(t) || "C.5".Equals(t) || "C.6".Equals(t) || "C.7".Equals(t) || "C.8".Equals(t) || "D.1".Equals(t) || "D.2".Equals(t))
-                    {
-                        if (4 == l.Length)
-                        {
-                            o1.Append("    new char[] { '\\u" + l + "' },");
-                            o1.Append("\t/* " + line.Trim() + " */\r\n");
-                        }
-                        else if (9 == l.Length)
-                        {
-                            o1.Append("    new char[] { '\\u");
-                            o1.Append(l.Substring(0, (4) - (0)));
-                            o1.Append("', '\\u");
-                            o1.Append(l.Substring(5, (9) - (5)));
-                            o1.Append("' },");
-                            o1.Append("\t/* " + line.Trim() + " */\r\n");
-                        }
-                    }
-                }
-
-                n++;
-            }
-
-            w.WriteLine("}");
-            w.WriteLine("}");
-            w.Close();            
-        }
-    }
-}
+/// <summary>
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
+///
+/// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
+///
+/// This file is part of GNU Libidn.
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
+/// </summary>
+
+using System;
+using System.IO;
+using System.Text;
+
+namespace gnu.inet.encoding.misc
+{
+    public class GenerateRFC3454
+    {
+        internal const string FILE_RFC3454  = "rfc3454.txt";
+        internal const string FILE_OUTPUT   = "RFC3454.cs";
+
+        public static void Generate()
+        {
+            if (!File.Exists(FILE_RFC3454))
+            {
+                Console.WriteLine("Unable to find rfc3454.txt.");
+                Console.WriteLine("Please download this file from:");
+                Console.WriteLine("http://www.ietf.org/rfc/rfc3454.txt");
+
+                return;
+            }
+
+            Console.WriteLine("Generating " + FILE_OUTPUT + " file...");
+
+
+            StreamReader r = new StreamReader(FILE_RFC3454);
+            StreamWriter w = new StreamWriter(FILE_OUTPUT);
+
+            w.WriteLine("// Do not edit !!!");
+            w.WriteLine("// this file is generated automatically");
+            w.WriteLine();
+            w.WriteLine("using System;");
+            w.WriteLine();
+            w.WriteLine("namespace Gnu.Inet.Encoding{");
+            w.WriteLine();
+            w.WriteLine("public class RFC3454");
+
+            w.WriteLine("{");
+
+            int n = 0;
+
+            string t = null;
+            System.Text.StringBuilder o1 = null;
+            System.Text.StringBuilder o2 = null;
+
+            while (true)
+            {
+                string line = r.ReadLine();
+                string l = line;
+
+                if (null == l)
+                {
+                    break;
+                }
+                l = l.Trim();
+
+                if (l.Equals(""))
+                {
+                    // Ignore empty line
+                }
+                else if (-1 != l.IndexOf("\u000c"))
+                {
+                    // Ignore FF
+                }
+                else if (0 == l.IndexOf("RFC"))
+                {
+                    // Ignore page header
+                }
+                else if (0 == l.IndexOf("Hoffman & Blanchet"))
+                {
+                    // Ignore page footer
+                }
+                else if (-1 != l.IndexOf("----- Start Table "))
+                {
+                    // Start of a table
+                    t = l.Substring(l.IndexOf("Table") + 6, (l.LastIndexOf("-----") - 1) - (l.IndexOf("Table") + 6));
+                    o1 = new System.Text.StringBuilder();
+                    o2 = new System.Text.StringBuilder();
+                }
+                else if (-1 != l.IndexOf("----- End Table "))
+                {
+                    // End of a table
+                    if ("A.1".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] A1 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("B.1".Equals(t))
+                    {
+                        w.WriteLine("  public static char[] B1 = new char[] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("B.2".Equals(t))
+                    {
+                        w.WriteLine("  public static char[] B2search = new char[] {\r\n" + o1.ToString() + "  };\r\n");
+                        w.WriteLine("  public static string[] B2replace = new string[] {\r\n" + o2.ToString() + "  };\r\n");
+                    }
+                    else if ("B.3".Equals(t))
+                    {
+                        w.WriteLine("  public static char[] B3search = new char[] {\r\n" + o1.ToString() + "  };\r\n");
+                        w.WriteLine("  public static string[] B3replace = new string[] {\r\n" + o2.ToString() + "  };\r\n");
+                    }
+                    else if ("C.1.1".Equals(t))
+                    {
+                        w.WriteLine("  public static char[] C11 = new char[] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("C.1.2".Equals(t))
+                    {
+                        w.WriteLine("  public static char[] C12 = new char[] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("C.2.1".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] C21 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("C.2.2".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] C22 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("C.3".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] C3 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("C.4".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] C4 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("C.5".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] C5 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("C.6".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] C6 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("C.7".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] C7 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("C.8".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] C8 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("D.1".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] D1 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    else if ("D.2".Equals(t))
+                    {
+                        w.WriteLine("  public static char[][] D2 = new char[][] {\r\n" + o1.ToString() + "  };\r\n");
+                    }
+                    t = null;
+                }
+                else if (null != t)
+                {
+                    // Filter comments
+                    if (-1 != l.LastIndexOf(";"))
+                    {
+                        string c = l.Substring(l.LastIndexOf(";")).Trim();
+                        try
+                        {
+                           Convert.ToInt32(c, 16);
+                        }
+                        catch
+                        {
+                            l = l.Substring(0, (l.LastIndexOf(";")) - (0));
+                        }
+                    }
+
+                    if ("A.1".Equals(t))
+                    {
+                        if (4 == l.Length)
+                        {
+                            o1.Append("    new char[] { '\\u");
+                            o1.Append(l);
+                            o1.Append("' },");
+                            o1.Append("\t/* " + line.Trim() + " */\r\n");
+                        }
+                        else if (5 == l.Length)
+                        {
+                            //Char
+                            o1.Append("\t/* Skip characters outside the range of .NET unicode " + line.Trim() + " */\n");
+                            //Console.WriteLine("Skip: " + l);
+                            // Skip characters outside the range of Java unicode
+                        }
+                        else if (9 == l.Length)
+                        {
+                            o1.Append("    new char[] { '\\u");
+                            o1.Append(l.Substring(0, (4) - (0)));
+                            o1.Append("', '\\u");
+                            o1.Append(l.Substring(5, (9) - (5)));
+                            o1.Append("' },");
+                            o1.Append("\t/* " + line.Trim() + " */\r\n");
+                        }
+                        else if (11 == l.Length)
+                        {
+                            o1.Append("\t/* Skip characters outside the range of .NET unicode " + line.Trim() + " */\n");
+                            //o1.AppendLine("// " + l);
+                            // Console.WriteLine("Skip: " + l);
+                            // Skip characters outside the range of Java unicode
+                        }
+                        else
+                        {
+                            Console.WriteLine("Unknown format of A.1 line: " + l);
+                        }
+                    }
+                    else if ("B.1".Equals(t))
+                    {
+                        Tokenizer tok = new Tokenizer(l, " ;");
+                        o1.Append("    '\\u" + tok.NextToken() + "',");
+                        o1.Append("\t/* " + line.Trim() + " */\r\n");
+                    }
+                    else if ("B.2".Equals(t) || "B.3".Equals(t))
+                    {
+                        Tokenizer tok = new Tokenizer(l, "; ");
+                        string c = tok.NextToken();
+                        if (c.Length == 4)
+                        {
+                            o1.Append("    '\\u" + c + "',");
+                            o1.Append("\t/*" + line.Trim() + "*/\r\n");
+                            if (tok.HasMoreTokens())
+                            {
+                                o2.Append("    \"");
+                                while (tok.HasMoreTokens())
+                                {
+                                    o2.Append("\\u" + tok.NextToken());
+                                }
+                                o2.Append("\",");
+                                o2.Append("\t/*" + line.Trim() + "*/\r\n");
+                            }
+                            else
+                            {
+                                o2.Append("    null,");
+                                o2.Append("\t/*" + line.Trim() + "*/\r\n");
+                            }
+                        }
+                    }
+                    else if ("C.1.1".Equals(t))
+                    {
+                        o1.Append("    '\\u" + l + "',");
+                        o1.Append("\t/* " + line.Trim() + " */\r\n");
+                    }
+                    else if ("C.1.2".Equals(t))
+                    {
+                        o1.Append("    '\\u" + l + "',");
+                        o1.Append("\t/* " + line.Trim() + " */\r\n");
+                    }
+                    else if ("C.2.1".Equals(t) || "C.2.2".Equals(t) || "C.3".Equals(t) || "C.4".Equals(t) || "C.5".Equals(t) || "C.6".Equals(t) || "C.7".Equals(t) || "C.8".Equals(t) || "D.1".Equals(t) || "D.2".Equals(t))
+                    {
+                        if (4 == l.Length)
+                        {
+                            o1.Append("    new char[] { '\\u" + l + "' },");
+                            o1.Append("\t/* " + line.Trim() + " */\r\n");
+                        }
+                        else if (9 == l.Length)
+                        {
+                            o1.Append("    new char[] { '\\u");
+                            o1.Append(l.Substring(0, (4) - (0)));
+                            o1.Append("', '\\u");
+                            o1.Append(l.Substring(5, (9) - (5)));
+                            o1.Append("' },");
+                            o1.Append("\t/* " + line.Trim() + " */\r\n");
+                        }
+                    }
+                }
+
+                n++;
+            }
+
+            w.WriteLine("}");
+            w.WriteLine("}");
+            w.Close();
+        }
+    }
+}
diff --git a/csharp/generate/HashSet.cs b/csharp/generate/HashSet.cs
index c9ea7bc..28e1e04 100644
--- a/csharp/generate/HashSet.cs
+++ b/csharp/generate/HashSet.cs
@@ -1,91 +1,101 @@
-/// <summary>
-/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
-/// Author: Alexander Gnauck AG-Software
-/// *
-/// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
-/// </summary>
-using System;
-using System.Collections;
-
-namespace gnu.inet.encoding.misc
-{
-    /// <summary>
-    /// HashSet class.
-    /// </summary>    
-    public class HashSet : ArrayList
-    {
-        public HashSet() : base()
-        {
-        }
-
-        public HashSet(System.Collections.ICollection c)
-        {
-            this.AddAll(c);
-        }
-
-        public HashSet(int capacity) : base(capacity)
-        {
-        }
-
-        /// <summary>
-        /// Adds a new element to the ArrayList if it is not already present.
-        /// </summary>		
-        /// <param name="obj">Element to insert to the ArrayList.</param>
-        /// <returns>Returns true if the new element was inserted, false otherwise.</returns>
-        new public virtual bool Add(System.Object obj)
-        {
-            bool inserted;
-
-            if ((inserted = this.Contains(obj)) == false)
-            {
-                base.Add(obj);
-            }
-
-            return !inserted;
-        }
-
-        /// <summary>
-        /// Adds all the elements of the specified collection that are not present to the list.
-        /// </summary>
-        /// <param name="c">Collection where the new elements will be added</param>
-        /// <returns>Returns true if at least one element was added, false otherwise.</returns>
-        public bool AddAll(System.Collections.ICollection c)
-        {
-            System.Collections.IEnumerator e = new System.Collections.ArrayList(c).GetEnumerator();
-            bool added = false;
-
-            while (e.MoveNext() == true)
-            {
-                if (this.Add(e.Current) == true)
-                    added = true;
-            }
-
-            return added;
-        }
-
-        /// <summary>
-        /// Returns a copy of the HashSet instance.
-        /// </summary>		
-        /// <returns>Returns a shallow copy of the current HashSet.</returns>
-        public override System.Object Clone()
-        {
-            return base.MemberwiseClone();
-        }
-    }
-}
+/// <summary>
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
+///
+/// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
+///
+/// This file is part of GNU Libidn.
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
+/// </summary>
+
+using System;
+using System.Collections;
+
+namespace gnu.inet.encoding.misc
+{
+    /// <summary>
+    /// HashSet class.
+    /// </summary>
+    public class HashSet : ArrayList
+    {
+        public HashSet() : base()
+        {
+        }
+
+        public HashSet(System.Collections.ICollection c)
+        {
+            this.AddAll(c);
+        }
+
+        public HashSet(int capacity) : base(capacity)
+        {
+        }
+
+        /// <summary>
+        /// Adds a new element to the ArrayList if it is not already present.
+        /// </summary>
+        /// <param name="obj">Element to insert to the ArrayList.</param>
+        /// <returns>Returns true if the new element was inserted, false otherwise.</returns>
+        new public virtual bool Add(System.Object obj)
+        {
+            bool inserted;
+
+            if ((inserted = this.Contains(obj)) == false)
+            {
+                base.Add(obj);
+            }
+
+            return !inserted;
+        }
+
+        /// <summary>
+        /// Adds all the elements of the specified collection that are not present to the list.
+        /// </summary>
+        /// <param name="c">Collection where the new elements will be added</param>
+        /// <returns>Returns true if at least one element was added, false otherwise.</returns>
+        public bool AddAll(System.Collections.ICollection c)
+        {
+            System.Collections.IEnumerator e = new System.Collections.ArrayList(c).GetEnumerator();
+            bool added = false;
+
+            while (e.MoveNext() == true)
+            {
+                if (this.Add(e.Current) == true)
+                    added = true;
+            }
+
+            return added;
+        }
+
+        /// <summary>
+        /// Returns a copy of the HashSet instance.
+        /// </summary>
+        /// <returns>Returns a shallow copy of the current HashSet.</returns>
+        public override System.Object Clone()
+        {
+            return base.MemberwiseClone();
+        }
+    }
+}
diff --git a/csharp/generate/Program.cs b/csharp/generate/Program.cs
index 0685e40..ee369f4 100644
--- a/csharp/generate/Program.cs
+++ b/csharp/generate/Program.cs
@@ -1,39 +1,49 @@
-/// <summary>
-/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
-/// Author: Alexander Gnauck AG-Software
-/// *
-/// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
-/// </summary>
-using System;
-
-namespace gnu.inet.encoding.misc
-{
-    class Program
-    {
-        /// <summary>
-        /// Main entry point of this console app
-        /// </summary>
-        /// <param name="args"></param>
-        static void Main(string[] args)
-        {
-            GenerateRFC3454.Generate();
-            GenerateNFKC.Generate();
-        }
-    }
-}
+/// <summary>
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
+///
+/// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
+///
+/// This file is part of GNU Libidn.
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
+/// </summary>
+
+using System;
+
+namespace gnu.inet.encoding.misc
+{
+    class Program
+    {
+        /// <summary>
+        /// Main entry point of this console app
+        /// </summary>
+        /// <param name="args"></param>
+        static void Main(string[] args)
+        {
+            GenerateRFC3454.Generate();
+            GenerateNFKC.Generate();
+        }
+    }
+}
diff --git a/csharp/generate/Tokenizer.cs b/csharp/generate/Tokenizer.cs
index a4db4ac..1ed2ae2 100644
--- a/csharp/generate/Tokenizer.cs
+++ b/csharp/generate/Tokenizer.cs
@@ -1,223 +1,233 @@
-/// <summary>
-/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
-/// *
-/// Author: Alexander Gnauck AG-Software
-/// *
-/// This file is part of GNU Libidn.
-/// *
-/// This library is free software; you can redistribute it and/or
-/// modify it under the terms of the GNU Lesser General Public License
-/// as published by the Free Software Foundation; either version 2.1 of
-/// the License, or (at your option) any later version.
-/// *
-/// This library is distributed in the hope that it will be useful, but
-/// WITHOUT ANY WARRANTY; without even the implied warranty of
-/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-/// Lesser General Public License for more details.
-/// *
-/// You should have received a copy of the GNU Lesser General Public
-/// License along with this library; if not, write to the Free Software
-/// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-/// USA
-/// </summary>
-using System;
-using System.Collections;
-using System.Text;
-
-namespace gnu.inet.encoding.misc
-{
-    /// <summary>
-    /// The class performs token processing in strings
-    /// </summary>
-    public class Tokenizer : IEnumerator
-    {
-        /// Position over the string
-        private long currentPos = 0;
-
-        /// Include demiliters in the results.
-        private bool includeDelims = false;
-
-        /// Char representation of the String to tokenize.
-        private char[] chars = null;
-
-        //The tokenizer uses the default delimiter set: the space character, the tab character, the newline character, and the carriage-return character and the form-feed character
-        private string delimiters = " \t\n\r\f";
-
-        /// <summary>
-        /// Initializes a new class instance with a specified string to process
-        /// </summary>
-        /// <param name="source">String to tokenize</param>
-        public Tokenizer(string source)
-        {
-            this.chars = source.ToCharArray();
-        }
-
-        /// <summary>
-        /// Initializes a new class instance with a specified string to process
-        /// and the specified token delimiters to use
-        /// </summary>
-        /// <param name="source">String to tokenize</param>
-        /// <param name="delimiters">String containing the delimiters</param>
-        public Tokenizer(string source, string delimiters)
-            : this(source)
-        {
-            this.delimiters = delimiters;
-        }
-
-
-        /// <summary>
-        /// Initializes a new class instance with a specified string to process, the specified token 
-        /// delimiters to use, and whether the delimiters must be included in the results.
-        /// </summary>
-        /// <param name="source">String to tokenize</param>
-        /// <param name="delimiters">String containing the delimiters</param>
-        /// <param name="includeDelims">Determines if delimiters are included in the results.</param>
-        public Tokenizer(string source, string delimiters, bool includeDelims)
-            : this(source, delimiters)
-        {
-            this.includeDelims = includeDelims;
-        }
-
-
-        /// <summary>
-        /// Returns the next token from the token list
-        /// </summary>
-        /// <returns>The string value of the token</returns>
-        public string NextToken()
-        {
-            return NextToken(this.delimiters);
-        }
-
-        /// <summary>
-        /// Returns the next token from the source string, using the provided
-        /// token delimiters
-        /// </summary>
-        /// <param name="delimiters">String containing the delimiters to use</param>
-        /// <returns>The string value of the token</returns>
-        public string NextToken(string delimiters)
-        {
-            //According to documentation, the usage of the received delimiters should be temporary (only for this call).
-            //However, it seems it is not true, so the following line is necessary.
-            this.delimiters = delimiters;
-
-            //at the end 
-            if (this.currentPos == this.chars.Length)
-                throw new System.ArgumentOutOfRangeException();
-            //if over a delimiter and delimiters must be returned
-            else if ((System.Array.IndexOf(delimiters.ToCharArray(), chars[this.currentPos]) != -1)
-                     && this.includeDelims)
-                return "" + this.chars[this.currentPos++];
-            //need to get the token wo delimiters.
-            else
-                return nextToken(delimiters.ToCharArray());
-        }
-
-        //Returns the nextToken wo delimiters
-        private string nextToken(char[] delimiters)
-        {
-            string token = "";
-            long pos = this.currentPos;
-
-            //skip possible delimiters
-            while (System.Array.IndexOf(delimiters, this.chars[currentPos]) != -1)
-                //The last one is a delimiter (i.e there is no more tokens)
-                if (++this.currentPos == this.chars.Length)
-                {
-                    this.currentPos = pos;
-                    throw new System.ArgumentOutOfRangeException();
-                }
-
-            //getting the token
-            while (System.Array.IndexOf(delimiters, this.chars[this.currentPos]) == -1)
-            {
-		// don't use += to work around bug in compiler
-		// see https://bugzilla.novell.com/show_bug.cgi?id=372483
-                token = token + this.chars[this.currentPos];
-                //the last one is not a delimiter
-                if (++this.currentPos == this.chars.Length)
-                    break;
-            }
-            return token;
-        }
-
-
-        /// <summary>
-        /// Determines if there are more tokens to return from the source string
-        /// </summary>
-        /// <returns>True or false, depending if there are more tokens</returns>
-        public bool HasMoreTokens()
-        {
-            //keeping the current pos
-            long pos = this.currentPos;
-
-            try
-            {
-                this.NextToken();
-            }
-            catch (System.ArgumentOutOfRangeException)
-            {
-                return false;
-            }
-            finally
-            {
-                this.currentPos = pos;
-            }
-            return true;
-        }
-
-        /// <summary>
-        /// Remaining tokens count
-        /// </summary>
-        public int Count
-        {
-            get
-            {
-                //keeping the current pos
-                long pos = this.currentPos;
-                int i = 0;
-
-                try
-                {
-                    while (true)
-                    {
-                        this.NextToken();
-                        i++;
-                    }
-                }
-                catch (System.ArgumentOutOfRangeException)
-                {
-                    this.currentPos = pos;
-                    return i;
-                }
-            }
-        }
-
-        /// <summary>
-        ///  Performs the same action as NextToken.
-        /// </summary>
-        public System.Object Current
-        {
-            get
-            {
-                return (Object)this.NextToken();
-            }
-        }
-
-        /// <summary>
-        //  Performs the same action as HasMoreTokens.
-        /// </summary>
-        /// <returns>True or false, depending if there are more tokens</returns>
-        public bool MoveNext()
-        {
-            return this.HasMoreTokens();
-        }
-
-        /// <summary>
-        /// Does nothing.
-        /// </summary>
-        public void Reset()
-        {
-            ;
-        }
-    }
-}
+/// <summary>
+/// Copyright (C) 2004-2012 Free Software Foundation, Inc.
+///
+/// Author: Alexander Gnauck AG-Software, mailto:gnauck@ag-software.de
+///
+/// This file is part of GNU Libidn.
+///
+/// GNU Libidn is free software: you can redistribute it and/or
+/// modify it under the terms of either:
+///
+///   * the GNU Lesser General Public License as published by the Free
+///     Software Foundation; either version 3 of the License, or (at
+///     your option) any later version.
+///
+/// or
+///
+///   * the GNU General Public License as published by the Free
+///     Software Foundation; either version 2 of the License, or (at
+///     your option) any later version.
+///
+/// or both in parallel, as here.
+///
+/// GNU Libidn is distributed in the hope that it will be useful,
+/// but WITHOUT ANY WARRANTY; without even the implied warranty of
+/// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+/// General Public License for more details.
+///
+/// You should have received copies of the GNU General Public License and
+/// the GNU Lesser General Public License along with this program.  If
+/// not, see <http://www.gnu.org/licenses/>.
+/// </summary>
+
+using System;
+using System.Collections;
+using System.Text;
+
+namespace gnu.inet.encoding.misc
+{
+    /// <summary>
+    /// The class performs token processing in strings
+    /// </summary>
+    public class Tokenizer : IEnumerator
+    {
+        /// Position over the string
+        private long currentPos = 0;
+
+        /// Include demiliters in the results.
+        private bool includeDelims = false;
+
+        /// Char representation of the String to tokenize.
+        private char[] chars = null;
+
+        //The tokenizer uses the default delimiter set: the space character, the tab character, the newline character, and the carriage-return character and the form-feed character
+        private string delimiters = " \t\n\r\f";
+
+        /// <summary>
+        /// Initializes a new class instance with a specified string to process
+        /// </summary>
+        /// <param name="source">String to tokenize</param>
+        public Tokenizer(string source)
+        {
+            this.chars = source.ToCharArray();
+        }
+
+        /// <summary>
+        /// Initializes a new class instance with a specified string to process
+        /// and the specified token delimiters to use
+        /// </summary>
+        /// <param name="source">String to tokenize</param>
+        /// <param name="delimiters">String containing the delimiters</param>
+        public Tokenizer(string source, string delimiters)
+            : this(source)
+        {
+            this.delimiters = delimiters;
+        }
+
+
+        /// <summary>
+        /// Initializes a new class instance with a specified string to process, the specified token
+        /// delimiters to use, and whether the delimiters must be included in the results.
+        /// </summary>
+        /// <param name="source">String to tokenize</param>
+        /// <param name="delimiters">String containing the delimiters</param>
+        /// <param name="includeDelims">Determines if delimiters are included in the results.</param>
+        public Tokenizer(string source, string delimiters, bool includeDelims)
+            : this(source, delimiters)
+        {
+            this.includeDelims = includeDelims;
+        }
+
+
+        /// <summary>
+        /// Returns the next token from the token list
+        /// </summary>
+        /// <returns>The string value of the token</returns>
+        public string NextToken()
+        {
+            return NextToken(this.delimiters);
+        }
+
+        /// <summary>
+        /// Returns the next token from the source string, using the provided
+        /// token delimiters
+        /// </summary>
+        /// <param name="delimiters">String containing the delimiters to use</param>
+        /// <returns>The string value of the token</returns>
+        public string NextToken(string delimiters)
+        {
+            //According to documentation, the usage of the received delimiters should be temporary (only for this call).
+            //However, it seems it is not true, so the following line is necessary.
+            this.delimiters = delimiters;
+
+            //at the end
+            if (this.currentPos == this.chars.Length)
+                throw new System.ArgumentOutOfRangeException();
+            //if over a delimiter and delimiters must be returned
+            else if ((System.Array.IndexOf(delimiters.ToCharArray(), chars[this.currentPos]) != -1)
+                     && this.includeDelims)
+                return "" + this.chars[this.currentPos++];
+            //need to get the token wo delimiters.
+            else
+                return nextToken(delimiters.ToCharArray());
+        }
+
+        //Returns the nextToken wo delimiters
+        private string nextToken(char[] delimiters)
+        {
+            string token = "";
+            long pos = this.currentPos;
+
+            //skip possible delimiters
+            while (System.Array.IndexOf(delimiters, this.chars[currentPos]) != -1)
+                //The last one is a delimiter (i.e there is no more tokens)
+                if (++this.currentPos == this.chars.Length)
+                {
+                    this.currentPos = pos;
+                    throw new System.ArgumentOutOfRangeException();
+                }
+
+            //getting the token
+            while (System.Array.IndexOf(delimiters, this.chars[this.currentPos]) == -1)
+            {
+		// don't use += to work around bug in compiler
+		// see https://bugzilla.novell.com/show_bug.cgi?id=372483
+                token = token + this.chars[this.currentPos];
+                //the last one is not a delimiter
+                if (++this.currentPos == this.chars.Length)
+                    break;
+            }
+            return token;
+        }
+
+
+        /// <summary>
+        /// Determines if there are more tokens to return from the source string
+        /// </summary>
+        /// <returns>True or false, depending if there are more tokens</returns>
+        public bool HasMoreTokens()
+        {
+            //keeping the current pos
+            long pos = this.currentPos;
+
+            try
+            {
+                this.NextToken();
+            }
+            catch (System.ArgumentOutOfRangeException)
+            {
+                return false;
+            }
+            finally
+            {
+                this.currentPos = pos;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Remaining tokens count
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                //keeping the current pos
+                long pos = this.currentPos;
+                int i = 0;
+
+                try
+                {
+                    while (true)
+                    {
+                        this.NextToken();
+                        i++;
+                    }
+                }
+                catch (System.ArgumentOutOfRangeException)
+                {
+                    this.currentPos = pos;
+                    return i;
+                }
+            }
+        }
+
+        /// <summary>
+        ///  Performs the same action as NextToken.
+        /// </summary>
+        public System.Object Current
+        {
+            get
+            {
+                return (Object)this.NextToken();
+            }
+        }
+
+        /// <summary>
+        //  Performs the same action as HasMoreTokens.
+        /// </summary>
+        /// <returns>True or false, depending if there are more tokens</returns>
+        public bool MoveNext()
+        {
+            return this.HasMoreTokens();
+        }
+
+        /// <summary>
+        /// Does nothing.
+        /// </summary>
+        public void Reset()
+        {
+            ;
+        }
+    }
+}
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2b42b3b..100eaf0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -25,8 +25,10 @@ EXTRA_DIST = gdoc libidn.html libidn.ps libidn.pdf texinfo.css	\
 	components.fig
 
 info_TEXINFOS = libidn.texi
-libidn_TEXINFOS = fdl-1.3.texi gpl-3.0.texi lgpl-2.1.texi $(gdoc_TEXINFOS) \
-	libidn-components.eps libidn-components.png libidn-components.pdf
+libidn_TEXINFOS = fdl-1.3.texi
+libidn_TEXINFOS += $(gdoc_TEXINFOS)
+libidn_TEXINFOS += libidn-components.eps libidn-components.png	\
+			libidn-components.pdf
 
 imagesdir = $(infodir)
 images_DATA = libidn-components.png
@@ -72,6 +74,6 @@ GDOC_MAN_PREFIX = man/
 GDOC_MAN_EXTRA_ARGS = -module $(PACKAGE) -sourceversion $(VERSION) \
 	-bugsto $(PACKAGE_BUGREPORT) -pkg-name "$(PACKAGE_NAME)" \
 	-includefuncprefix -seeinfo $(PACKAGE) \
-	-copyright "2002-2011 Simon Josefsson" \
+	-copyright "2002-2012 Simon Josefsson" \
 	-verbatimcopying
 include $(srcdir)/Makefile.gdoci
diff --git a/doc/gpl-3.0.texi b/doc/gpl-3.0.texi
deleted file mode 100644
index 97a17e1..0000000
--- a/doc/gpl-3.0.texi
+++ /dev/null
@@ -1,717 +0,0 @@
-@c The GNU General Public License.
-@center Version 3, 29 June 2007
-
-@c This file is intended to be included within another document,
-@c hence no sectioning command or @node.
-
-@display
-Copyright @copyright{} 2007 Free Software Foundation, Inc. @url{http://fsf.org/}
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-@end display
-
-@heading Preamble
-
-The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom
-to share and change all versions of a program---to make sure it remains
-free software for all its users.  We, the Free Software Foundation,
-use the GNU General Public License for most of our software; it
-applies also to any other work released this way by its authors.  You
-can apply it to your programs, too.
-
-When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you
-have certain responsibilities if you distribute copies of the
-software, or if you modify it: responsibilities to respect the freedom
-of others.
-
-For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too,
-receive or can get the source code.  And you must show them these
-terms so they know their rights.
-
-Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the
-manufacturer can do so.  This is fundamentally incompatible with the
-aim of protecting users' freedom to change the software.  The
-systematic pattern of such abuse occurs in the area of products for
-individuals to use, which is precisely where it is most unacceptable.
-Therefore, we have designed this version of the GPL to prohibit the
-practice for those products.  If such problems arise substantially in
-other domains, we stand ready to extend this provision to those
-domains in future versions of the GPL, as needed to protect the
-freedom of users.
-
-Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish
-to avoid the special danger that patents applied to a free program
-could make it effectively proprietary.  To prevent this, the GPL
-assures that patents cannot be used to render the program non-free.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-@heading TERMS AND CONDITIONS
-
-@enumerate 0
-@item Definitions.
-
-``This License'' refers to version 3 of the GNU General Public License.
-
-``Copyright'' also means copyright-like laws that apply to other kinds
-of works, such as semiconductor masks.
-
-``The Program'' refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as ``you''.  ``Licensees'' and
-``recipients'' may be individuals or organizations.
-
-To ``modify'' a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of
-an exact copy.  The resulting work is called a ``modified version'' of
-the earlier work or a work ``based on'' the earlier work.
-
-A ``covered work'' means either the unmodified Program or a work based
-on the Program.
-
-To ``propagate'' a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-To ``convey'' a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user
-through a computer network, with no transfer of a copy, is not
-conveying.
-
-An interactive user interface displays ``Appropriate Legal Notices'' to
-the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-@item Source Code.
-
-The ``source code'' for a work means the preferred form of the work for
-making modifications to it.  ``Object code'' means any non-source form
-of a work.
-
-A ``Standard Interface'' means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-The ``System Libraries'' of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-``Major Component'', in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-The ``Corresponding Source'' for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users can
-regenerate automatically from other parts of the Corresponding Source.
-
-The Corresponding Source for a work in source code form is that same
-work.
-
-@item Basic Permissions.
-
-All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not convey,
-without conditions so long as your license otherwise remains in force.
-You may convey covered works to others for the sole purpose of having
-them make modifications exclusively for you, or provide you with
-facilities for running those works, provided that you comply with the
-terms of this License in conveying all material for which you do not
-control copyright.  Those thus making or running the covered works for
-you must do so exclusively on your behalf, under your direction and
-control, on terms that prohibit them from making any copies of your
-copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under the
-conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-@item Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such
-circumvention is effected by exercising rights under this License with
-respect to the covered work, and you disclaim any intention to limit
-operation or modification of the work as a means of enforcing, against
-the work's users, your or third parties' legal rights to forbid
-circumvention of technological measures.
-
-@item Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-@item Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these
-conditions:
-
-@enumerate a
-@item
-The work must carry prominent notices stating that you modified it,
-and giving a relevant date.
-
-@item
-The work must carry prominent notices stating that it is released
-under this License and any conditions added under section 7.  This
-requirement modifies the requirement in section 4 to ``keep intact all
-notices''.
-
-@item
-You must license the entire work, as a whole, under this License to
-anyone who comes into possession of a copy.  This License will
-therefore apply, along with any applicable section 7 additional terms,
-to the whole of the work, and all its parts, regardless of how they
-are packaged.  This License gives no permission to license the work in
-any other way, but it does not invalidate such permission if you have
-separately received it.
-
-@item
-If the work has interactive user interfaces, each must display
-Appropriate Legal Notices; however, if the Program has interactive
-interfaces that do not display Appropriate Legal Notices, your work
-need not make them do so.
-@end enumerate
-
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-``aggregate'' if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-@item  Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms of
-sections 4 and 5, provided that you also convey the machine-readable
-Corresponding Source under the terms of this License, in one of these
-ways:
-
-@enumerate a
-@item
-Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by the
-Corresponding Source fixed on a durable physical medium customarily
-used for software interchange.
-
-@item
-Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by a written
-offer, valid for at least three years and valid for as long as you
-offer spare parts or customer support for that product model, to give
-anyone who possesses the object code either (1) a copy of the
-Corresponding Source for all the software in the product that is
-covered by this License, on a durable physical medium customarily used
-for software interchange, for a price no more than your reasonable
-cost of physically performing this conveying of source, or (2) access
-to copy the Corresponding Source from a network server at no charge.
-
-@item
-Convey individual copies of the object code with a copy of the written
-offer to provide the Corresponding Source.  This alternative is
-allowed only occasionally and noncommercially, and only if you
-received the object code with such an offer, in accord with subsection
-6b.
-
-@item
-Convey the object code by offering access from a designated place
-(gratis or for a charge), and offer equivalent access to the
-Corresponding Source in the same way through the same place at no
-further charge.  You need not require recipients to copy the
-Corresponding Source along with the object code.  If the place to copy
-the object code is a network server, the Corresponding Source may be
-on a different server (operated by you or a third party) that supports
-equivalent copying facilities, provided you maintain clear directions
-next to the object code saying where to find the Corresponding Source.
-Regardless of what server hosts the Corresponding Source, you remain
-obligated to ensure that it is available for as long as needed to
-satisfy these requirements.
-
-@item
-Convey the object code using peer-to-peer transmission, provided you
-inform other peers where the object code and Corresponding Source of
-the work are being offered to the general public at no charge under
-subsection 6d.
-
-@end enumerate
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A ``User Product'' is either (1) a ``consumer product'', which means any
-tangible personal property which is normally used for personal,
-family, or household purposes, or (2) anything designed or sold for
-incorporation into a dwelling.  In determining whether a product is a
-consumer product, doubtful cases shall be resolved in favor of
-coverage.  For a particular product received by a particular user,
-``normally used'' refers to a typical or common use of that class of
-product, regardless of the status of the particular user or of the way
-in which the particular user actually uses, or expects or is expected
-to use, the product.  A product is a consumer product regardless of
-whether the product has substantial commercial, industrial or
-non-consumer uses, unless such uses represent the only significant
-mode of use of the product.
-
-``Installation Information'' for a User Product means any methods,
-procedures, authorization keys, or other information required to
-install and execute modified versions of a covered work in that User
-Product from a modified version of its Corresponding Source.  The
-information must suffice to ensure that the continued functioning of
-the modified object code is in no case prevented or interfered with
-solely because modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or
-updates for a work that has been modified or installed by the
-recipient, or for the User Product in which it has been modified or
-installed.  Access to a network may be denied when the modification
-itself materially and adversely affects the operation of the network
-or violates the rules and protocols for communication across the
-network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-@item Additional Terms.
-
-``Additional permissions'' are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders
-of that material) supplement the terms of this License with terms:
-
-@enumerate a
-@item
-Disclaiming warranty or limiting liability differently from the terms
-of sections 15 and 16 of this License; or
-
-@item
-Requiring preservation of specified reasonable legal notices or author
-attributions in that material or in the Appropriate Legal Notices
-displayed by works containing it; or
-
-@item
-Prohibiting misrepresentation of the origin of that material, or
-requiring that modified versions of such material be marked in
-reasonable ways as different from the original version; or
-
-@item
-Limiting the use for publicity purposes of names of licensors or
-authors of the material; or
-
-@item
-Declining to grant rights under trademark law for use of some trade
-names, trademarks, or service marks; or
-
-@item
-Requiring indemnification of licensors and authors of that material by
-anyone who conveys the material (or modified versions of it) with
-contractual assumptions of liability to the recipient, for any
-liability that these contractual assumptions directly impose on those
-licensors and authors.
-@end enumerate
-
-All other non-permissive additional terms are considered ``further
-restrictions'' within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions; the
-above requirements apply either way.
-
-@item Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your license
-from a particular copyright holder is reinstated (a) provisionally,
-unless and until the copyright holder explicitly and finally
-terminates your license, and (b) permanently, if the copyright holder
-fails to notify you of the violation by some reasonable means prior to
-60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-@item Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or run
-a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-@item Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-An ``entity transaction'' is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-@item Patents.
-
-A ``contributor'' is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's ``contributor version''.
-
-A contributor's ``essential patent claims'' are all patent claims owned
-or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, ``control'' includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a ``patent license'' is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To ``grant'' such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  ``Knowingly relying'' means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is ``discriminatory'' if it does not include within the
-scope of its coverage, prohibits the exercise of, or is conditioned on
-the non-exercise of one or more of the rights that are specifically
-granted under this License.  You may not convey a covered work if you
-are a party to an arrangement with a third party that is in the
-business of distributing software, under which you make payment to the
-third party based on the extent of your activity of conveying the
-work, and under which the third party grants, to any of the parties
-who would receive the covered work from you, a discriminatory patent
-license (a) in connection with copies of the covered work conveyed by
-you (or copies made from those copies), or (b) primarily for and in
-connection with specific products or compilations that contain the
-covered work, unless you entered into that arrangement, or that patent
-license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-@item No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey
-a covered work so as to satisfy simultaneously your obligations under
-this License and any other pertinent obligations, then as a
-consequence you may not convey it at all.  For example, if you agree
-to terms that obligate you to collect a royalty for further conveying
-from those to whom you convey the Program, the only way you could
-satisfy both those terms and this License would be to refrain entirely
-from conveying the Program.
-
-@item Use with the GNU Affero General Public License.
-
-Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-@item Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions
-of the GNU General Public License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies that a certain numbered version of the GNU General Public
-License ``or any later version'' applies to it, you have the option of
-following the terms and conditions either of that numbered version or
-of any later version published by the Free Software Foundation.  If
-the Program does not specify a version number of the GNU General
-Public License, you may choose any version ever published by the Free
-Software Foundation.
-
-If the Program specifies that a proxy can decide which future versions
-of the GNU General Public License can be used, that proxy's public
-statement of acceptance of a version permanently authorizes you to
-choose that version for the Program.
-
-Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-@item Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM ``AS IS'' WITHOUT
-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE
-DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
-CORRECTION.
-
-@item Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
-CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
-NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
-LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
-TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
-PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-@item Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-@end enumerate
-
-@heading END OF TERMS AND CONDITIONS
-
-@heading How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these
-terms.
-
-To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the ``copyright'' line and a pointer to where the full notice is found.
-
-@smallexample
-@var{one line to give the program's name and a brief idea of what it does.}
-Copyright (C) @var{year} @var{name of author}
-
-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
-the Free Software Foundation, either version 3 of the License, or (at
-your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
-@end smallexample
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-@smallexample
-@var{program} Copyright (C) @var{year} @var{name of author}
-This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
-This is free software, and you are welcome to redistribute it
-under certain conditions; type @samp{show c} for details.
-@end smallexample
-
-The hypothetical commands @samp{show w} and @samp{show c} should show
-the appropriate parts of the General Public License.  Of course, your
-program's commands might be different; for a GUI interface, you would
-use an ``about box''.
-
-You should also get your employer (if you work as a programmer) or school,
-if any, to sign a ``copyright disclaimer'' for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-@url{http://www.gnu.org/licenses/}.
-
-The GNU General Public License does not permit incorporating your
-program into proprietary programs.  If your program is a subroutine
-library, you may consider it more useful to permit linking proprietary
-applications with the library.  If this is what you want to do, use
-the GNU Lesser General Public License instead of this License.  But
-first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
diff --git a/doc/lgpl-2.1.texi b/doc/lgpl-2.1.texi
deleted file mode 100644
index ab03d6c..0000000
--- a/doc/lgpl-2.1.texi
+++ /dev/null
@@ -1,549 +0,0 @@
-@c The GNU Lesser General Public License.
-@center Version 2.1, February 1999
-
-@c This file is intended to be included within another document,
-@c hence no sectioning command or @node.
-
-@display
-Copyright @copyright{} 1991, 1999 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
-as the successor of the GNU Library Public License, version 2, hence the
-version number 2.1.]
-@end display
-
-@subheading Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software---to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software---typically libraries---of the Free
-Software Foundation and other authors who decide to use it.  You can use
-it too, but we suggest you first think carefully about whether this
-license or the ordinary General Public License is the better strategy to
-use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of it
-in new free programs; and that you are informed that you can do these
-things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the @dfn{Lesser} General Public License because it
-does @emph{Less} to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-``work based on the library'' and a ``work that uses the library''.  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-@subheading TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-@enumerate 0
-@item
-This License Agreement applies to any software library or other program
-which contains a notice placed by the copyright holder or other
-authorized party saying it may be distributed under the terms of this
-Lesser General Public License (also called ``this License'').  Each
-licensee is addressed as ``you''.
-
-  A ``library'' means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The ``Library'', below, refers to any such software library or work
-which has been distributed under these terms.  A ``work based on the
-Library'' means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term ``modification''.)
-
-  ``Source code'' for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-@item
-You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-@item
-You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-@enumerate a
-@item
-The modified work must itself be a software library.
-
-@item
-You must cause the files modified to carry prominent notices
-stating that you changed the files and the date of any change.
-
-@item
-You must cause the whole of the work to be licensed at no
-charge to all third parties under the terms of this License.
-
-@item
-If a facility in the modified Library refers to a function or a
-table of data to be supplied by an application program that uses
-the facility, other than as an argument passed when the facility
-is invoked, then you must make a good faith effort to ensure that,
-in the event an application does not supply such function or
-table, the facility still operates, and performs whatever part of
-its purpose remains meaningful.
-
-(For example, a function in a library to compute square roots has
-a purpose that is entirely well-defined independent of the
-application.  Therefore, Subsection 2d requires that any
-application-supplied function or table used by this function must
-be optional: if the application does not supply it, the square
-root function must still compute square roots.)
-@end enumerate
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-@item
-You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-@item
-You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-@item
-A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a ``work that uses the Library''.  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a ``work that uses the Library'' with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a ``work that uses the
-library''.  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a ``work that uses the Library'' uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-@item
-As an exception to the Sections above, you may also combine or
-link a ``work that uses the Library'' with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-@enumerate a
-@item
-Accompany the work with the complete corresponding
-machine-readable source code for the Library including whatever
-changes were used in the work (which must be distributed under
-Sections 1 and 2 above); and, if the work is an executable linked
-with the Library, with the complete machine-readable ``work that
-uses the Library'', as object code and/or source code, so that the
-user can modify the Library and then relink to produce a modified
-executable containing the modified Library.  (It is understood
-that the user who changes the contents of definitions files in the
-Library will not necessarily be able to recompile the application
-to use the modified definitions.)
-
-@item
-Use a suitable shared library mechanism for linking with the Library.  A
-suitable mechanism is one that (1) uses at run time a copy of the
-library already present on the user's computer system, rather than
-copying library functions into the executable, and (2) will operate
-properly with a modified version of the library, if the user installs
-one, as long as the modified version is interface-compatible with the
-version that the work was made with.
-
-@item
-Accompany the work with a written offer, valid for at
-least three years, to give the same user the materials
-specified in Subsection 6a, above, for a charge no more
-than the cost of performing this distribution.
-
-@item
-If distribution of the work is made by offering access to copy
-from a designated place, offer equivalent access to copy the above
-specified materials from the same place.
-
-@item
-Verify that the user has already received a copy of these
-materials or that you have already sent this user a copy.
-@end enumerate
-
-  For an executable, the required form of the ``work that uses the
-Library'' must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies the
-executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-@item
-You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-@enumerate a
-@item
-Accompany the combined library with a copy of the same work
-based on the Library, uncombined with any other library
-facilities.  This must be distributed under the terms of the
-Sections above.
-
-@item
-Give prominent notice with the combined library of the fact
-that part of it is a work based on the Library, and explaining
-where to find the accompanying uncombined form of the same work.
-@end enumerate
-
-@item
-You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-@item
-You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-@item
-Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-@item
-If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-@item
-If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-@item
-The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-``any later version'', you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-@item
-If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-@center @b{NO WARRANTY}
-
-@item
-BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY ``AS IS'' WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-@item
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-@end enumerate
-
-@subheading END OF TERMS AND CONDITIONS
-
-@page
-@subheading How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-``copyright'' line and a pointer to where the full notice is found.
-
-@smallexample
-@var{one line to give the library's name and an idea of what it does.}
-Copyright (C) @var{year}  @var{name of author}
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or (at
-your option) any later version.
-
-This library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-USA.
-@end smallexample
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a ``copyright disclaimer'' for the library, if
-necessary.  Here is a sample; alter the names:
-
-@smallexample
-Yoyodyne, Inc., hereby disclaims all copyright interest in the library
-`Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-@var{signature of Ty Coon}, 1 April 1990
-Ty Coon, President of Vice
-@end smallexample
-
-That's all there is to it!
diff --git a/doc/libidn.texi b/doc/libidn.texi
index 67258e2..d9ff83c 100644
--- a/doc/libidn.texi
+++ b/doc/libidn.texi
@@ -81,7 +81,7 @@ Appendices
 
 * PR29 discussion::             Implementation aspects of the PR29 flaw.
 * On Label Separators::         Discussions of a flaw in the IDNA spec.
-* Copying Information::		License text covering the Libidn library.
+* Copying Information::		License texts.
 
 Indices
 
@@ -96,11 +96,10 @@ Indices
 
 GNU Libidn is a fully documented implementation of the Stringprep,
 Punycode and IDNA specifications.  Libidn's purpose is to encode and
-decode internationalized domain names.  The native C, C# and Java
-libraries are available under the GNU Lesser General Public License
-version 2.1 or later (@pxref{GNU LGPL}).
+decode internationalized domain name strings.  There are native C, C#
+and Java libraries.
 
-The library contains a generic Stringprep implementation.  Profiles
+The C library contains a generic Stringprep implementation.  Profiles
 for Nameprep, iSCSI, SASL, XMPP and Kerberos V5 are included.
 Punycode and ASCII Compatible Encoding (ACE) via IDNA are supported.
 A mechanism to define Top-Level Domain (TLD) specific validation
@@ -132,8 +131,7 @@ C++, Emacs Lisp, Python and Java.  A native Java and C# port is
 included.
 
 Also included is a command line tool, several self tests, code
-examples, and more, all licensed under the GNU General Public License
-version 3.0 or later (@pxref{GNU GPL}).
+examples, and more.
 
 @menu
 * Getting Started::
@@ -176,9 +174,8 @@ doing a similar job.
 
 @table @asis
 @item It's Free Software
-Anybody can use, modify, and redistribute it under the terms of the
-GNU Lesser General Public License version 2.1 or later (@pxref{GNU
-LGPL}).
+Anybody can use, modify, and redistribute it under the terms of a free
+software license.
 
 @item It's thread-safe
 No global state is kept in the library.  All functions are re-entrant.
@@ -1543,8 +1540,8 @@ xn--rksmrgs-5wao1o.se
 jas@@latte:~$
 @end example
 
-Reading input from command line, and disabling copyright and license
-information:
+Reading input from command line, and disable printing copyright and
+license information:
 
 @example
 jas@@latte:~$ idn --quiet r@"aksm@"org@aa{}s.se bl@aa{}b@ae{}rgr@o{}d.no
@@ -2152,8 +2149,6 @@ recommended way to work around this problem.
 
 @menu
 * GNU Free Documentation License::   License for copying this manual.
-* GNU LGPL::                         License for copying the library.
-* GNU GPL::                          License for copying the programs.
 @end menu
 
 @node GNU Free Documentation License
@@ -2163,20 +2158,6 @@ recommended way to work around this problem.
 
 @include fdl-1.3.texi
 
-@node GNU LGPL
-@appendixsec GNU Lesser General Public License
-@cindex LGPL, GNU Lesser General Public License
-@cindex License, GNU LGPL
-
-@include lgpl-2.1.texi
-
-@node GNU GPL
-@appendixsec GNU General Public License
-@cindex GPL, GNU General Public License
-@cindex License, GNU GPL
-
-@include gpl-3.0.texi
-
 @node Function and Variable Index
 @unnumbered Function and Variable Index
 
diff --git a/doc/reference/libidn-docs.sgml b/doc/reference/libidn-docs.sgml
index 1362e30..a432b9d 100644
--- a/doc/reference/libidn-docs.sgml
+++ b/doc/reference/libidn-docs.sgml
@@ -21,13 +21,12 @@
     <para>
 GNU Libidn is a fully documented implementation of the Stringprep,
 Punycode and IDNA specifications.  Libidn's purpose is to encode and
-decode internationalized domain names.  The native C, C# and Java
-libraries are available under the GNU Lesser General Public License
-version 2.1 or later.
+decode internationalized domain name strings.  There are native C, C#
+and Java libraries.
     </para>
 
     <para>
-The library contains a generic Stringprep implementation.  Profiles
+The C library contains a generic Stringprep implementation.  Profiles
 for Nameprep, iSCSI, SASL, XMPP and Kerberos V5 are included.
 Punycode and ASCII Compatible Encoding (ACE) via IDNA are supported.
 A mechanism to define Top-Level Domain (TLD) specific validation
@@ -67,9 +66,7 @@ included.
 
     <para>
 Also included is a command line tool, several self tests, code
-examples, and more, all licensed under the GNU General Public License
-version 3.0 or later.
-    </para>
+examples, and more.
 
     <para>
       The internal layout of the library, and how your application
diff --git a/gl/Makefile.am b/gl/Makefile.am
index e63f896..aaf9cf1 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -21,7 +21,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests --aux-dir=build-aux --with-tests --avoid=fcntl-h-tests --avoid=stdlib-tests --avoid=string-tests --avoid=sys_stat-tests --avoid=time-tests --avoid=unistd-tests --avoid=update-copyright-tests --avoid=wchar-tests --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files autobuild csharpcomp-script csharpexec-script error fdl-1.3 gendocs getopt-gnu gnupload gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings pmccabe2html progname update-copyright useless-if-before-free valgrind-tests vc-list-files version-etc warnings
+# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests --aux-dir=build-aux --with-tests --avoid=fcntl-h-tests --avoid=stdlib-tests --avoid=string-tests --avoid=sys_stat-tests --avoid=time-tests --avoid=unistd-tests --avoid=update-copyright-tests --avoid=wchar-tests --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files autobuild csharpcomp-script csharpexec-script error fdl-1.3 gendocs getopt-gnu gnupload maintainer-makefile manywarnings pmccabe2html progname update-copyright useless-if-before-free valgrind-tests vc-list-files version-etc warnings
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
diff --git a/gl/error.c b/gl/error.c
index b253ef7..dc8c65f 100644
--- a/gl/error.c
+++ b/gl/error.c
@@ -54,7 +54,7 @@
    function without parameters instead.  */
 void (*error_print_progname) (void);
 
-/* This variable is incremented each time `error' is called.  */
+/* This variable is incremented each time 'error' is called.  */
 unsigned int error_message_count;
 
 #ifdef _LIBC
@@ -65,7 +65,7 @@ unsigned int error_message_count;
 # include <limits.h>
 # include <libio/libioP.h>
 
-/* In GNU libc we want do not want to use the common name `error' directly.
+/* In GNU libc we want do not want to use the common name 'error' directly.
    Instead make it a weak alias.  */
 extern void __error (int status, int errnum, const char *message, ...)
      __attribute__ ((__format__ (__printf__, 3, 4)));
@@ -89,7 +89,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # include <unistd.h>
 
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the Win32 API functions.  */
+/* Get declarations of the native Windows API functions.  */
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
 /* Get _get_osfhandle.  */
@@ -125,9 +125,10 @@ static inline int
 is_open (int fd)
 {
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On Win32: The initial state of unassigned standard file descriptors is
-     that they are open but point to an INVALID_HANDLE_VALUE.  There is no
-     fcntl, and the gnulib replacement fcntl does not support F_GETFL.  */
+  /* On native Windows: The initial state of unassigned standard file
+     descriptors is that they are open but point to an INVALID_HANDLE_VALUE.
+     There is no fcntl, and the gnulib replacement fcntl does not support
+     F_GETFL.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
 # else
 #  ifndef F_GETFL
diff --git a/gl/error.h b/gl/error.h
index 5bcdf0d..9c2cb8b 100644
--- a/gl/error.h
+++ b/gl/error.h
@@ -35,9 +35,9 @@
 extern "C" {
 #endif
 
-/* Print a message with `fprintf (stderr, FORMAT, ...)';
+/* Print a message with 'fprintf (stderr, FORMAT, ...)';
    if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-   If STATUS is nonzero, terminate the program with `exit (STATUS)'.  */
+   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.  */
 
 extern void error (int __status, int __errnum, const char *__format, ...)
      _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4));
@@ -51,7 +51,7 @@ extern void error_at_line (int __status, int __errnum, const char *__fname,
    function without parameters instead.  */
 extern void (*error_print_progname) (void);
 
-/* This variable is incremented each time `error' is called.  */
+/* This variable is incremented each time 'error' is called.  */
 extern unsigned int error_message_count;
 
 /* Sometimes we want to have at most one error per line.  This
diff --git a/gl/getopt.c b/gl/getopt.c
index 807375a..4342a34 100644
--- a/gl/getopt.c
+++ b/gl/getopt.c
@@ -41,15 +41,15 @@
 # include <wchar.h>
 #endif
 
-/* This version of `getopt' appears to the caller like standard Unix `getopt'
+/* This version of 'getopt' appears to the caller like standard Unix 'getopt'
    but it behaves differently for the user, since it allows the user
    to intersperse the options with the other arguments.
 
-   As `getopt_long' works, it permutes the elements of ARGV so that,
+   As 'getopt_long' works, it permutes the elements of ARGV so that,
    when it is done, all the options precede everything else.  Thus
    all application programs are extended to handle flexible argument order.
 
-   Using `getopt' or setting the environment variable POSIXLY_CORRECT
+   Using 'getopt' or setting the environment variable POSIXLY_CORRECT
    disables permutation.
    Then the behavior is completely standard.
 
@@ -58,24 +58,24 @@
 
 #include "getopt_int.h"
 
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
+/* For communication from 'getopt' to the caller.
+   When 'getopt' finds an option that takes an argument,
    the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
+   Also, when 'ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
 char *optarg;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
+   and for communication between successive calls to 'getopt'.
 
-   On entry to `getopt', zero means this is the first call; initialize.
+   On entry to 'getopt', zero means this is the first call; initialize.
 
-   When `getopt' returns -1, this is the index of the first of the
+   When 'getopt' returns -1, this is the index of the first of the
    non-option elements that the caller should itself scan.
 
-   Otherwise, `optind' communicates from one call to the next
+   Otherwise, 'optind' communicates from one call to the next
    how much of ARGV has been scanned so far.  */
 
 /* 1003.2 says this must be 1 before any call.  */
@@ -137,7 +137,7 @@ extern char *__getopt_nonoption_flags;
    The other is elements [last_nonopt,optind), which contains all
    the options processed since those non-options were skipped.
 
-   `first_nonopt' and `last_nonopt' are relocated so that they describe
+   'first_nonopt' and 'last_nonopt' are relocated so that they describe
    the new indices of the non-options in ARGV after they are moved.  */
 
 static void
@@ -154,7 +154,7 @@ exchange (char **argv, struct _getopt_data *d)
      but it consists of two parts that need to be swapped next.  */
 
 #if defined _LIBC && defined USE_NONOPTION_FLAGS
-  /* First make sure the handling of the `__getopt_nonoption_flags'
+  /* First make sure the handling of the '__getopt_nonoption_flags'
      string can work normally.  Our top argument must be in the range
      of the string.  */
   if (d->__nonoption_flags_len > 0 && top >= d->__nonoption_flags_max_len)
@@ -291,48 +291,48 @@ _getopt_initialize (int argc _GL_UNUSED,
 
    If an element of ARGV starts with '-', and is not exactly "-" or "--",
    then it is an option element.  The characters of this element
-   (aside from the initial '-') are option characters.  If `getopt'
+   (aside from the initial '-') are option characters.  If 'getopt'
    is called repeatedly, it returns successively each of the option characters
    from each of the option elements.
 
-   If `getopt' finds another option character, it returns that character,
-   updating `optind' and `nextchar' so that the next call to `getopt' can
+   If 'getopt' finds another option character, it returns that character,
+   updating 'optind' and 'nextchar' so that the next call to 'getopt' can
    resume the scan with the following option character or ARGV-element.
 
-   If there are no more option characters, `getopt' returns -1.
-   Then `optind' is the index in ARGV of the first ARGV-element
+   If there are no more option characters, 'getopt' returns -1.
+   Then 'optind' is the index in ARGV of the first ARGV-element
    that is not an option.  (The ARGV-elements have been permuted
    so that those that are not options now come last.)
 
    OPTSTRING is a string containing the legitimate option characters.
    If an option character is seen that is not listed in OPTSTRING,
-   return '?' after printing an error message.  If you set `opterr' to
+   return '?' after printing an error message.  If you set 'opterr' to
    zero, the error message is suppressed but we still return '?'.
 
    If a char in OPTSTRING is followed by a colon, that means it wants an arg,
    so the following text in the same ARGV-element, or the text of the following
-   ARGV-element, is returned in `optarg'.  Two colons mean an option that
+   ARGV-element, is returned in 'optarg'.  Two colons mean an option that
    wants an optional arg; if there is text in the current ARGV-element,
-   it is returned in `optarg', otherwise `optarg' is set to zero.
+   it is returned in 'optarg', otherwise 'optarg' is set to zero.
 
-   If OPTSTRING starts with `-' or `+', it requests different methods of
+   If OPTSTRING starts with '-' or '+', it requests different methods of
    handling the non-option ARGV-elements.
    See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above.
 
-   Long-named options begin with `--' instead of `-'.
+   Long-named options begin with '--' instead of '-'.
    Their names may be abbreviated as long as the abbreviation is unique
    or is an exact match for some defined option.  If they have an
    argument, it follows the option name in the same ARGV-element, separated
-   from the option name by a `=', or else the in next ARGV-element.
-   When `getopt' finds a long-named option, it returns 0 if that option's
-   `flag' field is nonzero, the value of the option's `val' field
-   if the `flag' field is zero.
+   from the option name by a '=', or else the in next ARGV-element.
+   When 'getopt' finds a long-named option, it returns 0 if that option's
+   'flag' field is nonzero, the value of the option's 'val' field
+   if the 'flag' field is zero.
 
    The elements of ARGV aren't really const, because we permute them.
    But we pretend they're const in the prototype to be compatible
    with other systems.
 
-   LONGOPTS is a vector of `struct option' terminated by an
+   LONGOPTS is a vector of 'struct option' terminated by an
    element containing a name which is zero.
 
    LONGIND returns the index in LONGOPT of the long-named option found.
@@ -409,7 +409,7 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
           d->__last_nonopt = d->optind;
         }
 
-      /* The special ARGV-element `--' means premature end of options.
+      /* The special ARGV-element '--' means premature end of options.
          Skip it like a null option,
          then exchange with previous non-options as if it were an option,
          then skip everything else like a non-option.  */
@@ -788,7 +788,7 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
     char c = *d->__nextchar++;
     const char *temp = strchr (optstring, c);
 
-    /* Increment `optind' when we start to process its last character.  */
+    /* Increment 'optind' when we start to process its last character.  */
     if (*d->__nextchar == '\0')
       ++d->optind;
 
@@ -887,7 +887,7 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
             return c;
           }
         else
-          /* We already incremented `d->optind' once;
+          /* We already incremented 'd->optind' once;
              increment it again when taking next ARGV-elt as argument.  */
           d->optarg = argv[d->optind++];
 
@@ -1114,7 +1114,7 @@ _getopt_internal_r (int argc, char **argv, const char *optstring,
                   c = '?';
               }
             else
-              /* We already incremented `optind' once;
+              /* We already incremented 'optind' once;
                  increment it again when taking next ARGV-elt as argument.  */
               d->optarg = argv[d->optind++];
             d->__nextchar = NULL;
@@ -1177,7 +1177,7 @@ __posix_getopt (int argc, char *const *argv, const char *optstring)
 #ifdef TEST
 
 /* Compile with -DTEST to make an executable for use in testing
-   the above definition of `getopt'.  */
+   the above definition of 'getopt'.  */
 
 int
 main (int argc, char **argv)
diff --git a/gl/getopt.in.h b/gl/getopt.in.h
index 1bf2afe..06b6dfc 100644
--- a/gl/getopt.in.h
+++ b/gl/getopt.in.h
@@ -82,7 +82,7 @@
    getopt_long_only can permute argv; this is required for backward
    compatibility (e.g., for LSB 2.0.1).
 
-   This used to be `#if defined __GETOPT_PREFIX && !defined __need_getopt',
+   This used to be '#if defined __GETOPT_PREFIX && !defined __need_getopt',
    but it caused redefinition warnings if both unistd.h and getopt.h were
    included, since unistd.h includes getopt.h having previously defined
    __need_getopt.
@@ -128,29 +128,29 @@
 extern "C" {
 #endif
 
-/* For communication from `getopt' to the caller.
-   When `getopt' finds an option that takes an argument,
+/* For communication from 'getopt' to the caller.
+   When 'getopt' finds an option that takes an argument,
    the argument value is returned here.
-   Also, when `ordering' is RETURN_IN_ORDER,
+   Also, when 'ordering' is RETURN_IN_ORDER,
    each non-option ARGV-element is returned here.  */
 
 extern char *optarg;
 
 /* Index in ARGV of the next element to be scanned.
    This is used for communication to and from the caller
-   and for communication between successive calls to `getopt'.
+   and for communication between successive calls to 'getopt'.
 
-   On entry to `getopt', zero means this is the first call; initialize.
+   On entry to 'getopt', zero means this is the first call; initialize.
 
-   When `getopt' returns -1, this is the index of the first of the
+   When 'getopt' returns -1, this is the index of the first of the
    non-option elements that the caller should itself scan.
 
-   Otherwise, `optind' communicates from one call to the next
+   Otherwise, 'optind' communicates from one call to the next
    how much of ARGV has been scanned so far.  */
 
 extern int optind;
 
-/* Callers store zero here to inhibit the error message `getopt' prints
+/* Callers store zero here to inhibit the error message 'getopt' prints
    for unrecognized options.  */
 
 extern int opterr;
@@ -162,24 +162,24 @@ extern int optopt;
 #ifndef __need_getopt
 /* Describe the long-named options requested by the application.
    The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector
-   of `struct option' terminated by an element containing a name which is
+   of 'struct option' terminated by an element containing a name which is
    zero.
 
-   The field `has_arg' is:
+   The field 'has_arg' is:
    no_argument          (or 0) if the option does not take an argument,
    required_argument    (or 1) if the option requires an argument,
    optional_argument    (or 2) if the option takes an optional argument.
 
-   If the field `flag' is not NULL, it points to a variable that is set
-   to the value given in the field `val' when the option is found, but
+   If the field 'flag' is not NULL, it points to a variable that is set
+   to the value given in the field 'val' when the option is found, but
    left unchanged if the option is not found.
 
-   To have a long-named option do something other than set an `int' to
-   a compiled-in constant, such as set a value from `optarg', set the
-   option's `flag' field to zero and its `val' field to a nonzero
+   To have a long-named option do something other than set an 'int' to
+   a compiled-in constant, such as set a value from 'optarg', set the
+   option's 'flag' field to zero and its 'val' field to a nonzero
    value (the equivalent single-letter option character, if there is
-   one).  For long options that have a zero `flag' field, `getopt'
-   returns the contents of the `val' field.  */
+   one).  For long options that have a zero 'flag' field, 'getopt'
+   returns the contents of the 'val' field.  */
 
 # if !GNULIB_defined_struct_option
 struct option
@@ -194,7 +194,7 @@ struct option
 #  define GNULIB_defined_struct_option 1
 # endif
 
-/* Names for the values of the `has_arg' field of `struct option'.  */
+/* Names for the values of the 'has_arg' field of 'struct option'.  */
 
 # define no_argument            0
 # define required_argument      1
@@ -208,23 +208,23 @@ struct option
 
    Return the option character from OPTS just read.  Return -1 when
    there are no more options.  For unrecognized options, or options
-   missing arguments, `optopt' is set to the option letter, and '?' is
+   missing arguments, 'optopt' is set to the option letter, and '?' is
    returned.
 
    The OPTS string is a list of characters which are recognized option
    letters, optionally followed by colons, specifying that that letter
-   takes an argument, to be placed in `optarg'.
+   takes an argument, to be placed in 'optarg'.
 
    If a letter in OPTS is followed by two colons, its argument is
-   optional.  This behavior is specific to the GNU `getopt'.
+   optional.  This behavior is specific to the GNU 'getopt'.
 
-   The argument `--' causes premature termination of argument
-   scanning, explicitly telling `getopt' that there are no more
+   The argument '--' causes premature termination of argument
+   scanning, explicitly telling 'getopt' that there are no more
    options.
 
-   If OPTS begins with `-', then non-option arguments are treated as
+   If OPTS begins with '-', then non-option arguments are treated as
    arguments to the option '\1'.  This behavior is specific to the GNU
-   `getopt'.  If OPTS begins with `+', or POSIXLY_CORRECT is set in
+   'getopt'.  If OPTS begins with '+', or POSIXLY_CORRECT is set in
    the environment, then do not permute arguments.  */
 
 extern int getopt (int ___argc, char *const *___argv, const char *__shortopts)
diff --git a/gl/getopt1.c b/gl/getopt1.c
index 7cf41c8..fb2a8f5 100644
--- a/gl/getopt1.c
+++ b/gl/getopt1.c
@@ -141,11 +141,11 @@ main (int argc, char **argv)
           break;
 
         case 'c':
-          printf ("option c with value `%s'\n", optarg);
+          printf ("option c with value '%s'\n", optarg);
           break;
 
         case 'd':
-          printf ("option d with value `%s'\n", optarg);
+          printf ("option d with value '%s'\n", optarg);
           break;
 
         case '?':
diff --git a/gl/getopt_int.h b/gl/getopt_int.h
index 3c37544..2da020c 100644
--- a/gl/getopt_int.h
+++ b/gl/getopt_int.h
@@ -40,7 +40,7 @@ extern int _getopt_internal (int ___argc, char **___argv,
    stop option processing when the first non-option is seen.
    This is what Unix does.
    This mode of operation is selected by either setting the environment
-   variable POSIXLY_CORRECT, or using `+' as the first character
+   variable POSIXLY_CORRECT, or using '+' as the first character
    of the list of option characters, or by calling getopt.
 
    PERMUTE is the default.  We permute the contents of ARGV as we
@@ -52,12 +52,12 @@ extern int _getopt_internal (int ___argc, char **___argv,
    written to expect options and other ARGV-elements in any order
    and that care about the ordering of the two.  We describe each
    non-option ARGV-element as if it were the argument of an option
-   with character code 1.  Using `-' as the first character of the
+   with character code 1.  Using '-' as the first character of the
    list of option characters selects this mode of operation.
 
-   The special argument `--' forces an end of option-scanning regardless
-   of the value of `ordering'.  In the case of RETURN_IN_ORDER, only
-   `--' can cause `getopt' to return -1 with `optind' != ARGC.  */
+   The special argument '--' forces an end of option-scanning regardless
+   of the value of 'ordering'.  In the case of RETURN_IN_ORDER, only
+   '--' can cause 'getopt' to return -1 with 'optind' != ARGC.  */
 
 enum __ord
   {
@@ -99,8 +99,8 @@ struct _getopt_data
   /* Handle permutation of arguments.  */
 
   /* Describe the part of ARGV that contains non-options that have
-     been skipped.  `first_nonopt' is the index in ARGV of the first
-     of them; `last_nonopt' is the index after the last of them.  */
+     been skipped.  'first_nonopt' is the index in ARGV of the first
+     of them; 'last_nonopt' is the index after the last of them.  */
 
   int __first_nonopt;
   int __last_nonopt;
diff --git a/gl/m4/alloca.m4 b/gl/m4/alloca.m4
index 8579bff..656924b 100644
--- a/gl/m4/alloca.m4
+++ b/gl/m4/alloca.m4
@@ -1,4 +1,4 @@
-# alloca.m4 serial 13
+# alloca.m4 serial 14
 dnl Copyright (C) 2002-2004, 2006-2007, 2009-2012 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -53,8 +53,8 @@ m4_version_prereq([2.69], [] ,[
 
 # _AC_LIBOBJ_ALLOCA
 # -----------------
-# Set up the LIBOBJ replacement of `alloca'.  Well, not exactly
-# AC_LIBOBJ since we actually set the output variable `ALLOCA'.
+# Set up the LIBOBJ replacement of 'alloca'.  Well, not exactly
+# AC_LIBOBJ since we actually set the output variable 'ALLOCA'.
 # Nevertheless, for Automake, AC_LIBSOURCES it.
 m4_define([_AC_LIBOBJ_ALLOCA],
 [# The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -63,9 +63,9 @@ m4_define([_AC_LIBOBJ_ALLOCA],
 # use ar to extract alloca.o from them instead of compiling alloca.c.
 AC_LIBSOURCES(alloca.c)
 AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])dnl
-AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using `alloca.c'.])
+AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using 'alloca.c'.])
 
-AC_CACHE_CHECK(whether `alloca.c' needs Cray hooks, ac_cv_os_cray,
+AC_CACHE_CHECK(whether 'alloca.c' needs Cray hooks, ac_cv_os_cray,
 [AC_EGREP_CPP(webecray,
 [#if defined CRAY && ! defined CRAY2
 webecray
@@ -77,10 +77,10 @@ if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     AC_CHECK_FUNC($ac_func,
                   [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func,
-                                      [Define to one of `_getb67', `GETB67',
-                                       `getb67' for Cray-2 and Cray-YMP
+                                      [Define to one of '_getb67', 'GETB67',
+                                       'getb67' for Cray-2 and Cray-YMP
                                        systems. This function is required for
-                                       `alloca.c' support on those systems.])
+                                       'alloca.c' support on those systems.])
     break])
   done
 fi
diff --git a/gl/m4/extensions.m4 b/gl/m4/extensions.m4
index 94741cd..0bfaef6 100644
--- a/gl/m4/extensions.m4
+++ b/gl/m4/extensions.m4
@@ -1,4 +1,4 @@
-# serial 10  -*- Autoconf -*-
+# serial 11  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
 # Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
@@ -43,7 +43,7 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
   AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
   if test "$MINIX" = yes; then
     AC_DEFINE([_POSIX_SOURCE], [1],
-      [Define to 1 if you need to in order for `stat' and other
+      [Define to 1 if you need to in order for 'stat' and other
        things to work.])
     AC_DEFINE([_POSIX_1_SOURCE], [2],
       [Define to 2 if the system does not provide POSIX.1 features
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 453963b..0525d68 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests --aux-dir=build-aux --with-tests --avoid=fcntl-h-tests --avoid=stdlib-tests --avoid=string-tests --avoid=sys_stat-tests --avoid=time-tests --avoid=unistd-tests --avoid=update-copyright-tests --avoid=wchar-tests --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files autobuild csharpcomp-script csharpexec-script error fdl-1.3 gendocs getopt-gnu gnupload gpl-3.0 lgpl-2.1 maintainer-makefile manywarnings pmccabe2html progname update-copyright useless-if-before-free valgrind-tests vc-list-files version-etc warnings
+#   gnulib-tool --import --dir=. --local-dir=gl/override --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=gltests --aux-dir=build-aux --with-tests --avoid=fcntl-h-tests --avoid=stdlib-tests --avoid=string-tests --avoid=sys_stat-tests --avoid=time-tests --avoid=unistd-tests --avoid=update-copyright-tests --avoid=wchar-tests --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files autobuild csharpcomp-script csharpexec-script error fdl-1.3 gendocs getopt-gnu gnupload maintainer-makefile manywarnings pmccabe2html progname update-copyright useless-if-before-free valgrind-tests vc-list-files version-etc warnings
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl/override])
@@ -40,8 +40,6 @@ gl_MODULES([
   gendocs
   getopt-gnu
   gnupload
-  gpl-3.0
-  lgpl-2.1
   maintainer-makefile
   manywarnings
   pmccabe2html
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index d1be9e6..ae4d254 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 31
+# gnulib-common.m4 serial 32
 dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@ AC_DEFUN([gl_COMMON], [
 ])
 AC_DEFUN([gl_COMMON_BODY], [
   AH_VERBATIM([_Noreturn],
-[/* The _Noreturn keyword of draft C1X.  */
+[/* The _Noreturn keyword of C11.  */
 #ifndef _Noreturn
 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
       || 0x5110 <= __SUNPRO_C)
@@ -224,7 +224,7 @@ m4_ifndef([AS_VAR_IF],
 # - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
 #   to CC twice
 #   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>.
-# - AC_PROG_CC_STDC is likely to change when C1X is an ISO standard.
+# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
 AC_DEFUN([gl_PROG_CC_C99],
 [
   dnl Change that version number to the minimum Autoconf version that supports
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index e2c8dee..ffdb1b1 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -78,7 +78,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module gettext-h:
   # Code from module gnumakefile:
   # Code from module gnupload:
-  # Code from module gpl-3.0:
   # Code from module ignore-value:
   # Code from module ignore-value-tests:
   # Code from module include_next:
@@ -89,7 +88,6 @@ AC_DEFUN([gl_EARLY],
   # Code from module inttypes-tests:
   # Code from module largefile:
   AC_REQUIRE([AC_SYS_LARGEFILE])
-  # Code from module lgpl-2.1:
   # Code from module lstat:
   # Code from module lstat-tests:
   # Code from module maintainer-makefile:
@@ -499,8 +497,6 @@ AC_DEFUN([gl_FILE_LIST], [
   build-aux/vc-list-files
   doc/fdl-1.3.texi
   doc/gendocs_template
-  doc/gpl-3.0.texi
-  doc/lgpl-2.1.texi
   lib/errno.in.h
   lib/error.c
   lib/error.h
diff --git a/gl/m4/include_next.m4 b/gl/m4/include_next.m4
index 6593e03..a60a261 100644
--- a/gl/m4/include_next.m4
+++ b/gl/m4/include_next.m4
@@ -143,7 +143,7 @@ choke me
 # even if the compiler does not support include_next.
 # The three "///" are to pacify Sun C 5.8, which otherwise would say
 # "warning: #include of /usr/include/... may be non-portable".
-# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
+# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
 # Note: This macro assumes that the header file is not empty after
 # preprocessing, i.e. it does not only define preprocessor macros but also
 # provides some type/enum definitions or function/variable declarations.
diff --git a/gl/m4/inttypes.m4 b/gl/m4/inttypes.m4
index 989c261..eec4f41 100644
--- a/gl/m4/inttypes.m4
+++ b/gl/m4/inttypes.m4
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 25
+# inttypes.m4 serial 26
 dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -147,6 +147,7 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
   HAVE_DECL_IMAXDIV=1;   AC_SUBST([HAVE_DECL_IMAXDIV])
   HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
   HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
+  REPLACE_STRTOIMAX=0;   AC_SUBST([REPLACE_STRTOIMAX])
   INT32_MAX_LT_INTMAX_MAX=1;  AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
   INT64_MAX_EQ_LONG_MAX='defined _LP64';  AC_SUBST([INT64_MAX_EQ_LONG_MAX])
   PRI_MACROS_BROKEN=0;   AC_SUBST([PRI_MACROS_BROKEN])
diff --git a/gl/m4/longlong.m4 b/gl/m4/longlong.m4
index 42a19ac..b9c65c7 100644
--- a/gl/m4/longlong.m4
+++ b/gl/m4/longlong.m4
@@ -1,4 +1,4 @@
-# longlong.m4 serial 16
+# longlong.m4 serial 17
 dnl Copyright (C) 1999-2007, 2009-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT],
       fi])
   if test $ac_cv_type_long_long_int = yes; then
     AC_DEFINE([HAVE_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type `long long int'.])
+      [Define to 1 if the system has the type 'long long int'.])
   fi
 ])
 
@@ -77,7 +77,7 @@ AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
      fi])
   if test $ac_cv_type_unsigned_long_long_int = yes; then
     AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type `unsigned long long int'.])
+      [Define to 1 if the system has the type 'unsigned long long int'.])
   fi
 ])
 
diff --git a/gl/m4/lstat.m4 b/gl/m4/lstat.m4
index f41a2df..b83858b 100644
--- a/gl/m4/lstat.m4
+++ b/gl/m4/lstat.m4
@@ -1,4 +1,4 @@
-# serial 23
+# serial 24
 
 # Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc.
 #
@@ -65,6 +65,6 @@ AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
     ])
   test $gl_cv_func_lstat_dereferences_slashed_symlink = yes &&
     AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
-      [Define to 1 if `lstat' dereferences a symlink specified
+      [Define to 1 if 'lstat' dereferences a symlink specified
        with a trailing slash.])
 ])
diff --git a/gl/m4/time_h.m4 b/gl/m4/time_h.m4
index dd4b522..b88da76 100644
--- a/gl/m4/time_h.m4
+++ b/gl/m4/time_h.m4
@@ -25,7 +25,7 @@ AC_DEFUN([gl_HEADER_TIME_H_BODY],
   AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC])
 ])
 
-dnl Define HAVE_STRUCT_TIMESPEC if `struct timespec' is declared
+dnl Define HAVE_STRUCT_TIMESPEC if 'struct timespec' is declared
 dnl in time.h, sys/time.h, or pthread.h.
 
 AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
diff --git a/gl/msvc-inval.c b/gl/msvc-inval.c
index 25374b7..b7a917d 100644
--- a/gl/msvc-inval.c
+++ b/gl/msvc-inval.c
@@ -40,7 +40,7 @@ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
 
 # else
 
-/* Get declarations of the Win32 API functions.  */
+/* Get declarations of the native Windows API functions.  */
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
 
diff --git a/gl/msvc-inval.h b/gl/msvc-inval.h
index 88aa26b..373f9bf 100644
--- a/gl/msvc-inval.h
+++ b/gl/msvc-inval.h
@@ -207,7 +207,7 @@ extern struct gl_msvc_inval_per_thread *gl_msvc_inval_current (void);
    or when SANE_LIBRARY_HANDLING is desired.  */
 
 /* The braces here avoid GCC warnings like
-   "warning: suggest explicit braces to avoid ambiguous `else'".  */
+   "warning: suggest explicit braces to avoid ambiguous 'else'".  */
 # define TRY_MSVC_INVAL \
     do                                                                         \
       {                                                                        \
diff --git a/gl/msvc-nothrow.c b/gl/msvc-nothrow.c
index 178288f..f0fea17 100644
--- a/gl/msvc-nothrow.c
+++ b/gl/msvc-nothrow.c
@@ -21,7 +21,7 @@
 /* Specification.  */
 #include "msvc-nothrow.h"
 
-/* Get declarations of the Win32 API functions.  */
+/* Get declarations of the native Windows API functions.  */
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
diff --git a/gl/verify.h b/gl/verify.h
index e9d6666..cef14ad 100644
--- a/gl/verify.h
+++ b/gl/verify.h
@@ -21,13 +21,11 @@
 # define _GL_VERIFY_H
 
 
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per the
-   C1X draft N1548 section 6.7.10.  This is supported by GCC 4.6.0 and
-   later, in C mode, and its use here generates easier-to-read diagnostics
-   when verify (R) fails.
+/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
+   This is supported by GCC 4.6.0 and later, in C mode, and its use
+   here generates easier-to-read diagnostics when verify (R) fails.
 
-   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per the
-   C++0X draft N3242 section 7.(4).
+   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
    This will likely be supported by future GCC versions, in C++ mode.
 
    Use this only with GCC.  If we were willing to slow 'configure'
@@ -188,7 +186,7 @@ template <int w>
    trailing ';'.  If R is false, fail at compile-time, preferably
    with a diagnostic that includes the string-literal DIAGNOSTIC.
 
-   Unfortunately, unlike C1X, this implementation must appear as an
+   Unfortunately, unlike C11, this implementation must appear as an
    ordinary declaration, and cannot appear inside struct { ... }.  */
 
 # ifdef _GL_HAVE__STATIC_ASSERT
@@ -205,7 +203,7 @@ template <int w>
 #   define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
 #  endif
 #  if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
-#   define static_assert _Static_assert /* Draft C1X requires this #define.  */
+#   define static_assert _Static_assert /* C11 requires this #define.  */
 #  endif
 # endif
 
diff --git a/gl/version-etc.h b/gl/version-etc.h
index 4e47b6f..c62704c 100644
--- a/gl/version-etc.h
+++ b/gl/version-etc.h
@@ -22,7 +22,7 @@
 # include <stdarg.h>
 # include <stdio.h>
 
-/* The `sentinel' attribute was added in gcc 4.0.  */
+/* The 'sentinel' attribute was added in gcc 4.0.  */
 #ifndef _GL_ATTRIBUTE_SENTINEL
 # if 4 <= __GNUC__
 #  define _GL_ATTRIBUTE_SENTINEL __attribute__ ((__sentinel__))
@@ -72,7 +72,7 @@ extern void version_etc (FILE *stream,
                          /* const char *author1, ..., NULL */ ...)
   _GL_ATTRIBUTE_SENTINEL;
 
-/* Display the usual `Report bugs to' stanza */
+/* Display the usual "Report bugs to" stanza.  */
 extern void emit_bug_reporting_address (void);
 
 #endif /* VERSION_ETC_H */
diff --git a/gltests/Makefile.am b/gltests/Makefile.am
index 9fa3022..f71ecb1 100644
--- a/gltests/Makefile.am
+++ b/gltests/Makefile.am
@@ -329,7 +329,7 @@ BUILT_SOURCES += inttypes.h
 
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
-inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
@@ -350,10 +350,12 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_N
 	      -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
 	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
 	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
+	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
 	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
 	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
 	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
 	      -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/inttypes.in.h; \
diff --git a/gltests/dup2.c b/gltests/dup2.c
index 313b619..f6d0f1c 100644
--- a/gltests/dup2.c
+++ b/gltests/dup2.c
@@ -31,7 +31,7 @@
 
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* Get declarations of the Win32 API functions.  */
+/* Get declarations of the native Windows API functions.  */
 #  define WIN32_LEAN_AND_MEAN
 #  include <windows.h>
 
diff --git a/gltests/fcntl.in.h b/gltests/fcntl.in.h
index ceaa9ba..84ae3ee 100644
--- a/gltests/fcntl.in.h
+++ b/gltests/fcntl.in.h
@@ -177,12 +177,12 @@ _GL_WARN_ON_USE (openat, "openat is not portable - "
 /* Fix up the O_* macros.  */
 
 #if !defined O_DIRECT && defined O_DIRECTIO
-/* Tru64 spells it `O_DIRECTIO'.  */
+/* Tru64 spells it 'O_DIRECTIO'.  */
 # define O_DIRECT O_DIRECTIO
 #endif
 
 #if !defined O_CLOEXEC && defined O_NOINHERIT
-/* Mingw spells it `O_NOINHERIT'.  */
+/* Mingw spells it 'O_NOINHERIT'.  */
 # define O_CLOEXEC O_NOINHERIT
 #endif
 
diff --git a/gltests/getcwd-lgpl.c b/gltests/getcwd-lgpl.c
index 57f908a..f1e821b 100644
--- a/gltests/getcwd-lgpl.c
+++ b/gltests/getcwd-lgpl.c
@@ -32,7 +32,7 @@ typedef int dummy;
    (perhaps because the absolute name was longer than PATH_MAX, or
    because of missing read/search permissions on parent directories)
    or SIZE was too small.  If successful, returns BUF.  If BUF is
-   NULL, an array is allocated with `malloc'; the array is SIZE bytes
+   NULL, an array is allocated with 'malloc'; the array is SIZE bytes
    long, unless SIZE == 0, in which case it is as big as
    necessary.  */
 
diff --git a/gltests/init.sh b/gltests/init.sh
index 9485492..5985552 100644
--- a/gltests/init.sh
+++ b/gltests/init.sh
@@ -61,7 +61,7 @@ ME_=`expr "./$0" : '.*/\(.*\)$'`
 
 # We use a trap below for cleanup.  This requires us to go through
 # hoops to get the right exit status transported through the handler.
-# So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
+# So use 'Exit STATUS' instead of 'exit STATUS' inside of the tests.
 # Turn off errexit here so that we don't trip the bug with OSF1/Tru64
 # sh inside this function.
 Exit () { set +e; (exit $1); exit $1; }
@@ -172,7 +172,7 @@ else
     if test "$re_shell_" = __current__; then
       # 'eval'ing this code makes Solaris 10's /bin/sh exit with
       # $? set to 2.  It does not evaluate any of the code after the
-      # "unexpected" first `('.  Thus, we must run it in a subshell.
+      # "unexpected" first '('.  Thus, we must run it in a subshell.
       ( eval "$gl_shell_test_script_" ) > /dev/null 2>&1
     else
       "$re_shell_" -c "$gl_shell_test_script_" 2>/dev/null
@@ -255,7 +255,7 @@ compare_dev_null_ ()
   return 2
 }
 
-if diff_out_=`( diff -u "$0" "$0" < /dev/null ) 2>/dev/null`; then
+if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null`; then
   if test -z "$diff_out_"; then
     compare_ () { diff -u "$@"; }
   else
@@ -273,7 +273,7 @@ if diff_out_=`( diff -u "$0" "$0" < /dev/null ) 2>/dev/null`; then
       fi
     }
   fi
-elif diff_out_=`( diff -c "$0" "$0" < /dev/null ) 2>/dev/null`; then
+elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
   if test -z "$diff_out_"; then
     compare_ () { diff -c "$@"; }
   else
diff --git a/gltests/inttypes.in.h b/gltests/inttypes.in.h
index e08a660..b9da2b5 100644
--- a/gltests/inttypes.in.h
+++ b/gltests/inttypes.in.h
@@ -56,6 +56,8 @@
 # error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to <bug-gnulib@gnu.org>."
 #endif
 
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
 /* The definition of _GL_ARG_NONNULL is copied here.  */
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
@@ -1077,10 +1079,23 @@ _GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - "
 #endif
 
 #if @GNULIB_STRTOIMAX@
-# if !@HAVE_DECL_STRTOIMAX@
-#  undef strtoimax
-extern intmax_t strtoimax (const char *, char **, int) _GL_ARG_NONNULL ((1));
+# if @REPLACE_STRTOIMAX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strtoimax
+#   define strtoimax rpl_strtoimax
+#  endif
+_GL_FUNCDECL_RPL (strtoimax, intmax_t,
+                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (strtoimax, intmax_t, (const char *, char **, int));
+# else
+#  if !@HAVE_DECL_STRTOIMAX@
+#   undef strtoimax
+_GL_FUNCDECL_SYS (strtoimax, intmax_t,
+                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (strtoimax, intmax_t, (const char *, char **, int));
 # endif
+_GL_CXXALIASWARN (strtoimax);
 #elif defined GNULIB_POSIXCHECK
 # undef strtoimax
 # if HAVE_RAW_DECL_STRTOIMAX
@@ -1092,8 +1107,11 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - "
 #if @GNULIB_STRTOUMAX@
 # if !@HAVE_DECL_STRTOUMAX@
 #  undef strtoumax
-extern uintmax_t strtoumax (const char *, char **, int) _GL_ARG_NONNULL ((1));
+_GL_FUNCDECL_SYS (strtoumax, uintmax_t,
+                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
 # endif
+_GL_CXXALIAS_SYS (strtoumax, uintmax_t, (const char *, char **, int));
+_GL_CXXALIASWARN (strtoumax);
 #elif defined GNULIB_POSIXCHECK
 # undef strtoumax
 # if HAVE_RAW_DECL_STRTOUMAX
diff --git a/gltests/lstat.c b/gltests/lstat.c
index 146e5dc..db119a1 100644
--- a/gltests/lstat.c
+++ b/gltests/lstat.c
@@ -51,11 +51,11 @@ orig_lstat (const char *filename, struct stat *buf)
 # include <errno.h>
 
 /* lstat works differently on Linux and Solaris systems.  POSIX (see
-   `pathname resolution' in the glossary) requires that programs like
-   `ls' take into consideration the fact that FILE has a trailing slash
+   "pathname resolution" in the glossary) requires that programs like
+   'ls' take into consideration the fact that FILE has a trailing slash
    when FILE is a symbolic link.  On Linux and Solaris 10 systems, the
    lstat function already has the desired semantics (in treating
-   `lstat ("symlink/", sbuf)' just like `lstat ("symlink/.", sbuf)',
+   'lstat ("symlink/", sbuf)' just like 'lstat ("symlink/.", sbuf)',
    but on Solaris 9 and earlier it does not.
 
    If FILE has a trailing slash and specifies a symbolic link,
diff --git a/gltests/putenv.c b/gltests/putenv.c
index 5f26b66..3c0f7ea 100644
--- a/gltests/putenv.c
+++ b/gltests/putenv.c
@@ -43,7 +43,7 @@ extern char **environ;
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of `environ'.  */
+/* This lock protects against simultaneous modifications of 'environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
@@ -91,7 +91,7 @@ _unsetenv (const char *name)
 
 
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.
-   If STRING contains no `=', then remove STRING from the environment.  */
+   If STRING contains no '=', then remove STRING from the environment.  */
 int
 putenv (char *string)
 {
diff --git a/gltests/setenv.c b/gltests/setenv.c
index 3854a99..8201be2 100644
--- a/gltests/setenv.c
+++ b/gltests/setenv.c
@@ -49,7 +49,7 @@
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of `environ'.  */
+/* This lock protects against simultaneous modifications of 'environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
@@ -103,11 +103,11 @@ static void *known_values;
 static char **last_environ;
 
 
-/* This function is used by `setenv' and `putenv'.  The difference between
+/* This function is used by 'setenv' and 'putenv'.  The difference between
    the two functions is that for the former must create a new string which
-   is then placed in the environment, while the argument of `putenv'
+   is then placed in the environment, while the argument of 'putenv'
    must be used directly.  This is all complicated by the fact that we try
-   to reuse values once generated for a `setenv' call since we can never
+   to reuse values once generated for a 'setenv' call since we can never
    free the strings.  */
 int
 __add_to_environ (const char *name, const char *value, const char *combined,
@@ -299,7 +299,7 @@ setenv (const char *name, const char *value, int replace)
   return __add_to_environ (name, value, NULL, replace);
 }
 
-/* The `clearenv' was planned to be added to POSIX.1 but probably
+/* The 'clearenv' was planned to be added to POSIX.1 but probably
    never made it.  Nevertheless the POSIX.9 standard (POSIX bindings
    for Fortran 77) requires this function.  */
 int
diff --git a/gltests/stdio.in.h b/gltests/stdio.in.h
index 07fcef7..0481930 100644
--- a/gltests/stdio.in.h
+++ b/gltests/stdio.in.h
@@ -186,7 +186,7 @@ _GL_CXXALIASWARN (fdopen);
 #elif defined GNULIB_POSIXCHECK
 # undef fdopen
 /* Assume fdopen is always declared.  */
-_GL_WARN_ON_USE (fdopen, "fdopen on Win32 platforms is not POSIX compatible - "
+_GL_WARN_ON_USE (fdopen, "fdopen on native Windows platforms is not POSIX compliant - "
                  "use gnulib module fdopen for portability");
 #endif
 
@@ -259,7 +259,7 @@ _GL_CXXALIASWARN (fopen);
 #elif defined GNULIB_POSIXCHECK
 # undef fopen
 /* Assume fopen is always declared.  */
-_GL_WARN_ON_USE (fopen, "fopen on Win32 platforms is not POSIX compatible - "
+_GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX compliant - "
                  "use gnulib module fopen for portability");
 #endif
 
@@ -387,7 +387,7 @@ _GL_CXXALIASWARN (freopen);
 # undef freopen
 /* Assume freopen is always declared.  */
 _GL_WARN_ON_USE (freopen,
-                 "freopen on Win32 platforms is not POSIX compatible - "
+                 "freopen on native Windows platforms is not POSIX compliant - "
                  "use gnulib module freopen for portability");
 #endif
 
diff --git a/gltests/test-dup2.c b/gltests/test-dup2.c
index bf8e5a2..5043c0c 100644
--- a/gltests/test-dup2.c
+++ b/gltests/test-dup2.c
@@ -33,7 +33,7 @@ SIGNATURE_CHECK (dup2, int, (int, int));
 #endif
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-/* Get declarations of the Win32 API functions.  */
+/* Get declarations of the native Windows API functions.  */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 /* Get _get_osfhandle.  */
@@ -47,7 +47,7 @@ static int
 is_open (int fd)
 {
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On Win32, the initial state of unassigned standard file
+  /* On native Windows, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   return (HANDLE) _get_osfhandle (fd) != INVALID_HANDLE_VALUE;
@@ -65,7 +65,7 @@ static int
 is_inheritable (int fd)
 {
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
-  /* On Win32, the initial state of unassigned standard file
+  /* On native Windows, the initial state of unassigned standard file
      descriptors is that they are open but point to an
      INVALID_HANDLE_VALUE, and there is no fcntl.  */
   HANDLE h = (HANDLE) _get_osfhandle (fd);
diff --git a/gltests/test-init.sh b/gltests/test-init.sh
index 123da8e..3368a99 100755
--- a/gltests/test-init.sh
+++ b/gltests/test-init.sh
@@ -52,14 +52,20 @@ EOF
   compare empty in >out 2>err && fail=1
   # Remove the TAB-date suffix on each --- and +++ line,
   # for both the expected and the actual output files.
+  # Also remove the @@ line, since Solaris 5.10 and GNU diff formats differ:
+  # -@@ -0,0 +1 @@
+  # +@@ -1,0 +1,1 @@
   cat <<\EOF > exp
 --- empty
 +++ in
-@@ -0,0 +1 @@
 +xyz
 EOF
-  sed 's/	.*//' out > k && mv k out
-  compare exp out || fail=1
+  sed 's/	.*//;/^@@/d' out > k && mv k out
+
+  # Compare against expected output only if compare is using diff -u.
+  if (diff -u out out < /dev/null) > /dev/null 2>&1; then
+    compare exp out || fail=1
+  fi
   case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
 }
 
diff --git a/gltests/test-vc-list-files-cvs.sh b/gltests/test-vc-list-files-cvs.sh
index 8b17b85..68b0a0f 100755
--- a/gltests/test-vc-list-files-cvs.sh
+++ b/gltests/test-vc-list-files-cvs.sh
@@ -36,7 +36,6 @@ for i in with-cvsu without; do
   ok=0
   mkdir $tmpdir && cd $tmpdir &&
     # without cvs, skip the test
-    # The double use of 'exit' is needed for the reference to $? inside the trap.
     { ( cvs -Q -d "$repo" init ) > /dev/null 2>&1 \
       || skip_ "cvs not found in PATH"; } &&
     mkdir w && cd w &&
diff --git a/gltests/unsetenv.c b/gltests/unsetenv.c
index b1e659b..ddbe9a4 100644
--- a/gltests/unsetenv.c
+++ b/gltests/unsetenv.c
@@ -36,7 +36,7 @@
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of `environ'.  */
+/* This lock protects against simultaneous modifications of 'environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
diff --git a/java/Makefile.am b/java/Makefile.am
index bdda356..5f9739e 100644
--- a/java/Makefile.am
+++ b/java/Makefile.am
@@ -3,19 +3,18 @@
 #
 # This file is part of GNU Libidn.
 #
-# GNU Libidn is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# GNU Libidn is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with GNU Libidn; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 SUBDIRS = gnu . misc
 
diff --git a/java/gnu/Makefile.am b/java/gnu/Makefile.am
index 021f2b8..e40dc86 100644
--- a/java/gnu/Makefile.am
+++ b/java/gnu/Makefile.am
@@ -1 +1,19 @@
+## Process this file with automake to produce Makefile.in
+# Copyright (C) 2004-2012 Simon Josefsson
+#
+# This file is part of GNU Libidn.
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 SUBDIRS = inet
diff --git a/java/gnu/inet/Makefile.am b/java/gnu/inet/Makefile.am
index 9807577..bdad4fc 100644
--- a/java/gnu/inet/Makefile.am
+++ b/java/gnu/inet/Makefile.am
@@ -1 +1,19 @@
+## Process this file with automake to produce Makefile.in
+# Copyright (C) 2004-2012 Simon Josefsson
+#
+# This file is part of GNU Libidn.
+#
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 SUBDIRS = encoding
diff --git a/java/gnu/inet/encoding/IDNA.java b/java/gnu/inet/encoding/IDNA.java
index 59a55d2..c366525 100644
--- a/java/gnu/inet/encoding/IDNA.java
+++ b/java/gnu/inet/encoding/IDNA.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 package gnu.inet.encoding;
 
diff --git a/java/gnu/inet/encoding/IDNAException.java b/java/gnu/inet/encoding/IDNAException.java
index 8a4aff9..09e11ea 100644
--- a/java/gnu/inet/encoding/IDNAException.java
+++ b/java/gnu/inet/encoding/IDNAException.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 package gnu.inet.encoding;
 
diff --git a/java/gnu/inet/encoding/Makefile.am b/java/gnu/inet/encoding/Makefile.am
index e294212..f526e5a 100644
--- a/java/gnu/inet/encoding/Makefile.am
+++ b/java/gnu/inet/encoding/Makefile.am
@@ -1,27 +1,26 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004-2012 Simon Josefsson.
+# Copyright (C) 2004-2012 Simon Josefsson
 #
 # This file is part of GNU Libidn.
 #
-# GNU Libidn is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# GNU Libidn is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with GNU Libidn; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 JAVAROOT = $(top_builddir)/java
 
 if JAVA
-dist_noinst_JAVA = CombiningClass.java	\
+dist_noinst_JAVA = \
+	CombiningClass.java		\
 	Composition.java		\
 	DecompositionKeys.java		\
 	DecompositionMappings.java	\
@@ -33,4 +32,4 @@ dist_noinst_JAVA = CombiningClass.java	\
 	RFC3454.java			\
 	Stringprep.java			\
 	StringprepException.java
-endif # JAVA
+endif
diff --git a/java/gnu/inet/encoding/NFKC.java b/java/gnu/inet/encoding/NFKC.java
index 99c6e4d..19c1cb8 100644
--- a/java/gnu/inet/encoding/NFKC.java
+++ b/java/gnu/inet/encoding/NFKC.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 package gnu.inet.encoding;
 
diff --git a/java/gnu/inet/encoding/Punycode.java b/java/gnu/inet/encoding/Punycode.java
index 4e04296..024a9eb 100644
--- a/java/gnu/inet/encoding/Punycode.java
+++ b/java/gnu/inet/encoding/Punycode.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 package gnu.inet.encoding;
 
diff --git a/java/gnu/inet/encoding/PunycodeException.java b/java/gnu/inet/encoding/PunycodeException.java
index dbfab6c..999bf60 100644
--- a/java/gnu/inet/encoding/PunycodeException.java
+++ b/java/gnu/inet/encoding/PunycodeException.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 package gnu.inet.encoding;
 
diff --git a/java/gnu/inet/encoding/Stringprep.java b/java/gnu/inet/encoding/Stringprep.java
index e3c6261..8f12729 100644
--- a/java/gnu/inet/encoding/Stringprep.java
+++ b/java/gnu/inet/encoding/Stringprep.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 package gnu.inet.encoding;
 
diff --git a/java/gnu/inet/encoding/StringprepException.java b/java/gnu/inet/encoding/StringprepException.java
index f84e420..5880ebc 100644
--- a/java/gnu/inet/encoding/StringprepException.java
+++ b/java/gnu/inet/encoding/StringprepException.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 package gnu.inet.encoding;
 
diff --git a/java/misc/GenerateNFKC.java b/java/misc/GenerateNFKC.java
index 8dc73be..efe3899 100644
--- a/java/misc/GenerateNFKC.java
+++ b/java/misc/GenerateNFKC.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/java/misc/GenerateRFC3454.java b/java/misc/GenerateRFC3454.java
index 6337b4c..3743c46 100644
--- a/java/misc/GenerateRFC3454.java
+++ b/java/misc/GenerateRFC3454.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/java/misc/Makefile.am b/java/misc/Makefile.am
index d82ea05..3ce0c3e 100644
--- a/java/misc/Makefile.am
+++ b/java/misc/Makefile.am
@@ -1,26 +1,28 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation
+# Copyright (C) 2004-2012  Free Software Foundation
 #
 # This file is part of GNU Libidn.
 #
-# GNU Libidn is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# GNU Libidn is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with GNU Libidn; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 JAVAROOT = $(top_builddir)/java/misc
 AM_JAVACFLAGS = -classpath $(top_builddir)/java/libidn-$(VERSION).jar:$(top_srcdir)/java/libidn-$(VERSION).jar
 
 if JAVA
-dist_noinst_JAVA = GenerateRFC3454.java GenerateNFKC.java	\
-			TestIDNA.java TestNFKC.java
-endif # JAVA
+dist_noinst_JAVA = \
+	GenerateRFC3454.java \
+	GenerateNFKC.java \
+	TestIDNA.java \
+	TestNFKC.java
+endif
diff --git a/java/misc/TestIDNA.java b/java/misc/TestIDNA.java
index 262238b..11a3bac 100644
--- a/java/misc/TestIDNA.java
+++ b/java/misc/TestIDNA.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 import gnu.inet.encoding.IDNA;
 import gnu.inet.encoding.IDNAException;
diff --git a/java/misc/TestNFKC.java b/java/misc/TestNFKC.java
index 7d71dd8..3a08c2d 100644
--- a/java/misc/TestNFKC.java
+++ b/java/misc/TestNFKC.java
@@ -1,25 +1,31 @@
-/**
- * Copyright (C) 2004-2012 Free Software Foundation, Inc.
- *
- * Author: Oliver Hitz
- *
- * This file is part of GNU Libidn.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
+/* Copyright (C) 2004-2012 Free Software Foundation, Inc.
+   Author: Oliver Hitz
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 import gnu.inet.encoding.NFKC;
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0ea6a2d..69d0989 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,19 +4,18 @@
 #
 # This file is part of GNU Libidn.
 #
-# GNU Libidn is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# GNU Libidn is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with GNU Libidn; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 EXTRA_DIST = gen-stringprep-tables.pl gen-unicode-tables.pl gen-tld-tables.pl
 
diff --git a/lib/gl/m4/alloca.m4 b/lib/gl/m4/alloca.m4
index 8579bff..656924b 100644
--- a/lib/gl/m4/alloca.m4
+++ b/lib/gl/m4/alloca.m4
@@ -1,4 +1,4 @@
-# alloca.m4 serial 13
+# alloca.m4 serial 14
 dnl Copyright (C) 2002-2004, 2006-2007, 2009-2012 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -53,8 +53,8 @@ m4_version_prereq([2.69], [] ,[
 
 # _AC_LIBOBJ_ALLOCA
 # -----------------
-# Set up the LIBOBJ replacement of `alloca'.  Well, not exactly
-# AC_LIBOBJ since we actually set the output variable `ALLOCA'.
+# Set up the LIBOBJ replacement of 'alloca'.  Well, not exactly
+# AC_LIBOBJ since we actually set the output variable 'ALLOCA'.
 # Nevertheless, for Automake, AC_LIBSOURCES it.
 m4_define([_AC_LIBOBJ_ALLOCA],
 [# The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -63,9 +63,9 @@ m4_define([_AC_LIBOBJ_ALLOCA],
 # use ar to extract alloca.o from them instead of compiling alloca.c.
 AC_LIBSOURCES(alloca.c)
 AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.$ac_objext])dnl
-AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using `alloca.c'.])
+AC_DEFINE(C_ALLOCA, 1, [Define to 1 if using 'alloca.c'.])
 
-AC_CACHE_CHECK(whether `alloca.c' needs Cray hooks, ac_cv_os_cray,
+AC_CACHE_CHECK(whether 'alloca.c' needs Cray hooks, ac_cv_os_cray,
 [AC_EGREP_CPP(webecray,
 [#if defined CRAY && ! defined CRAY2
 webecray
@@ -77,10 +77,10 @@ if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     AC_CHECK_FUNC($ac_func,
                   [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func,
-                                      [Define to one of `_getb67', `GETB67',
-                                       `getb67' for Cray-2 and Cray-YMP
+                                      [Define to one of '_getb67', 'GETB67',
+                                       'getb67' for Cray-2 and Cray-YMP
                                        systems. This function is required for
-                                       `alloca.c' support on those systems.])
+                                       'alloca.c' support on those systems.])
     break])
   done
 fi
diff --git a/lib/gl/m4/extensions.m4 b/lib/gl/m4/extensions.m4
index 94741cd..0bfaef6 100644
--- a/lib/gl/m4/extensions.m4
+++ b/lib/gl/m4/extensions.m4
@@ -1,4 +1,4 @@
-# serial 10  -*- Autoconf -*-
+# serial 11  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
 
 # Copyright (C) 2003, 2006-2012 Free Software Foundation, Inc.
@@ -43,7 +43,7 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
   AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
   if test "$MINIX" = yes; then
     AC_DEFINE([_POSIX_SOURCE], [1],
-      [Define to 1 if you need to in order for `stat' and other
+      [Define to 1 if you need to in order for 'stat' and other
        things to work.])
     AC_DEFINE([_POSIX_1_SOURCE], [2],
       [Define to 2 if the system does not provide POSIX.1 features
diff --git a/lib/gl/m4/gnulib-common.m4 b/lib/gl/m4/gnulib-common.m4
index d1be9e6..ae4d254 100644
--- a/lib/gl/m4/gnulib-common.m4
+++ b/lib/gl/m4/gnulib-common.m4
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 31
+# gnulib-common.m4 serial 32
 dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -13,7 +13,7 @@ AC_DEFUN([gl_COMMON], [
 ])
 AC_DEFUN([gl_COMMON_BODY], [
   AH_VERBATIM([_Noreturn],
-[/* The _Noreturn keyword of draft C1X.  */
+[/* The _Noreturn keyword of C11.  */
 #ifndef _Noreturn
 # if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
       || 0x5110 <= __SUNPRO_C)
@@ -224,7 +224,7 @@ m4_ifndef([AS_VAR_IF],
 # - When AC_PROG_CC_STDC is invoked twice, it adds the C99 enabling options
 #   to CC twice
 #   <http://lists.gnu.org/archive/html/bug-gnulib/2011-09/msg00431.html>.
-# - AC_PROG_CC_STDC is likely to change when C1X is an ISO standard.
+# - AC_PROG_CC_STDC is likely to change now that C11 is an ISO standard.
 AC_DEFUN([gl_PROG_CC_C99],
 [
   dnl Change that version number to the minimum Autoconf version that supports
diff --git a/lib/gl/m4/include_next.m4 b/lib/gl/m4/include_next.m4
index 6593e03..a60a261 100644
--- a/lib/gl/m4/include_next.m4
+++ b/lib/gl/m4/include_next.m4
@@ -143,7 +143,7 @@ choke me
 # even if the compiler does not support include_next.
 # The three "///" are to pacify Sun C 5.8, which otherwise would say
 # "warning: #include of /usr/include/... may be non-portable".
-# Use `""', not `<>', so that the /// cannot be confused with a C99 comment.
+# Use '""', not '<>', so that the /// cannot be confused with a C99 comment.
 # Note: This macro assumes that the header file is not empty after
 # preprocessing, i.e. it does not only define preprocessor macros but also
 # provides some type/enum definitions or function/variable declarations.
diff --git a/lib/gl/m4/inttypes.m4 b/lib/gl/m4/inttypes.m4
index 989c261..eec4f41 100644
--- a/lib/gl/m4/inttypes.m4
+++ b/lib/gl/m4/inttypes.m4
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 25
+# inttypes.m4 serial 26
 dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -147,6 +147,7 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
   HAVE_DECL_IMAXDIV=1;   AC_SUBST([HAVE_DECL_IMAXDIV])
   HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
   HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
+  REPLACE_STRTOIMAX=0;   AC_SUBST([REPLACE_STRTOIMAX])
   INT32_MAX_LT_INTMAX_MAX=1;  AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
   INT64_MAX_EQ_LONG_MAX='defined _LP64';  AC_SUBST([INT64_MAX_EQ_LONG_MAX])
   PRI_MACROS_BROKEN=0;   AC_SUBST([PRI_MACROS_BROKEN])
diff --git a/lib/gl/m4/ld-version-script.m4 b/lib/gl/m4/ld-version-script.m4
index fd8c043..5ed93ef 100644
--- a/lib/gl/m4/ld-version-script.m4
+++ b/lib/gl/m4/ld-version-script.m4
@@ -1,4 +1,4 @@
-# ld-version-script.m4 serial 2
+# ld-version-script.m4 serial 3
 dnl Copyright (C) 2008-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -26,6 +26,12 @@ AC_DEFUN([gl_LD_VERSION_SCRIPT],
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
     cat > conftest.map <<EOF
+foo
+EOF
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+                   [accepts_syntax_errors=yes], [accepts_syntax_errors=no])
+    if test "$accepts_syntax_errors" = no; then
+      cat > conftest.map <<EOF
 VERS_1 {
         global: sym;
 };
@@ -34,8 +40,11 @@ VERS_2 {
         global: sym;
 } VERS_1;
 EOF
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-                   [have_ld_version_script=yes], [have_ld_version_script=no])
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
+                     [have_ld_version_script=yes], [have_ld_version_script=no])
+    else
+      have_ld_version_script=no
+    fi
     rm -f conftest.map
     LDFLAGS="$save_LDFLAGS"
     AC_MSG_RESULT($have_ld_version_script)
diff --git a/lib/gl/m4/locale-fr.m4 b/lib/gl/m4/locale-fr.m4
index 8450ad4..4cb14b5 100644
--- a/lib/gl/m4/locale-fr.m4
+++ b/lib/gl/m4/locale-fr.m4
@@ -1,4 +1,4 @@
-# locale-fr.m4 serial 13
+# locale-fr.m4 serial 14
 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -26,7 +26,7 @@ char buf[16];
 int main () {
   /* Check whether the given locale name is recognized by the system.  */
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Win32, setlocale(category, "") looks at the system settings,
+  /* On native Windows, setlocale(category, "") looks at the system settings,
      not at the environment variables.  Also, when an encoding suffix such
      as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE
      category of the locale to "C".  */
@@ -80,7 +80,7 @@ changequote([,])dnl
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
         mingw*)
-          # Test for the native Win32 locale name.
+          # Test for the native Windows locale name.
           if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
             gt_cv_locale_fr=French_France.1252
           else
@@ -152,7 +152,7 @@ int main () {
 #if !(defined __BEOS__ || defined __HAIKU__)
   /* Check whether the given locale name is recognized by the system.  */
 # if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Win32, setlocale(category, "") looks at the system settings,
+  /* On native Windows, setlocale(category, "") looks at the system settings,
      not at the environment variables.  Also, when an encoding suffix such
      as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE
      category of the locale to "C".  */
@@ -206,7 +206,7 @@ changequote([,])dnl
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
         mingw*)
-          # Test for the hypothetical native Win32 locale name.
+          # Test for the hypothetical native Windows locale name.
           if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
             gt_cv_locale_fr_utf8=French_France.65001
           else
diff --git a/lib/gl/m4/locale-ja.m4 b/lib/gl/m4/locale-ja.m4
index b4c88ab..b427f09 100644
--- a/lib/gl/m4/locale-ja.m4
+++ b/lib/gl/m4/locale-ja.m4
@@ -1,4 +1,4 @@
-# locale-ja.m4 serial 9
+# locale-ja.m4 serial 10
 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -28,7 +28,7 @@ int main ()
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Win32, setlocale(category, "") looks at the system settings,
+  /* On native Windows, setlocale(category, "") looks at the system settings,
      not at the environment variables.  Also, when an encoding suffix such
      as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE
      category of the locale to "C".  */
@@ -84,8 +84,9 @@ changequote([,])dnl
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
         mingw*)
-          # Note that on native Win32, the Japanese locale is Japanese_Japan.932,
-          # and CP932 is very different from EUC-JP, so we cannot use it here.
+          # Note that on native Windows, the Japanese locale is
+          # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
+          # cannot use it here.
           gt_cv_locale_ja=none
           ;;
         *)
diff --git a/lib/gl/m4/locale-tr.m4 b/lib/gl/m4/locale-tr.m4
index f849808..4bae6a5 100644
--- a/lib/gl/m4/locale-tr.m4
+++ b/lib/gl/m4/locale-tr.m4
@@ -1,4 +1,4 @@
-# locale-tr.m4 serial 7
+# locale-tr.m4 serial 8
 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -31,7 +31,7 @@ int main () {
      program return 1 on BeOS.  */
   /* Check whether the given locale name is recognized by the system.  */
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Win32, setlocale(category, "") looks at the system settings,
+  /* On native Windows, setlocale(category, "") looks at the system settings,
      not at the environment variables.  Also, when an encoding suffix such
      as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE
      category of the locale to "C".  */
@@ -85,7 +85,7 @@ changequote([,])dnl
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
         mingw*)
-          # Test for the hypothetical native Win32 locale name.
+          # Test for the hypothetical native Windows locale name.
           if (LC_ALL=Turkish_Turkey.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
             gt_cv_locale_tr_utf8=Turkish_Turkey.65001
           else
diff --git a/lib/gl/m4/locale-zh.m4 b/lib/gl/m4/locale-zh.m4
index 92b78a4..de1a43b 100644
--- a/lib/gl/m4/locale-zh.m4
+++ b/lib/gl/m4/locale-zh.m4
@@ -1,4 +1,4 @@
-# locale-zh.m4 serial 9
+# locale-zh.m4 serial 10
 dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -29,7 +29,7 @@ int main ()
   const char *p;
   /* Check whether the given locale name is recognized by the system.  */
 #if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
-  /* On native Win32, setlocale(category, "") looks at the system settings,
+  /* On native Windows, setlocale(category, "") looks at the system settings,
      not at the environment variables.  Also, when an encoding suffix such
      as ".65001" or ".54936" is speficied, it succeeds but sets the LC_CTYPE
      category of the locale to "C".  */
@@ -85,7 +85,7 @@ changequote([,])dnl
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
         mingw*)
-          # Test for the hypothetical native Win32 locale name.
+          # Test for the hypothetical native Windows locale name.
           if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
             gt_cv_locale_zh_CN=Chinese_China.54936
           else
diff --git a/lib/gl/m4/longlong.m4 b/lib/gl/m4/longlong.m4
index 42a19ac..b9c65c7 100644
--- a/lib/gl/m4/longlong.m4
+++ b/lib/gl/m4/longlong.m4
@@ -1,4 +1,4 @@
-# longlong.m4 serial 16
+# longlong.m4 serial 17
 dnl Copyright (C) 1999-2007, 2009-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@ AC_DEFUN([AC_TYPE_LONG_LONG_INT],
       fi])
   if test $ac_cv_type_long_long_int = yes; then
     AC_DEFINE([HAVE_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type `long long int'.])
+      [Define to 1 if the system has the type 'long long int'.])
   fi
 ])
 
@@ -77,7 +77,7 @@ AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
      fi])
   if test $ac_cv_type_unsigned_long_long_int = yes; then
     AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1],
-      [Define to 1 if the system has the type `unsigned long long int'.])
+      [Define to 1 if the system has the type 'unsigned long long int'.])
   fi
 ])
 
diff --git a/lib/gl/m4/threadlib.m4 b/lib/gl/m4/threadlib.m4
index ed9188a..9cedb67 100644
--- a/lib/gl/m4/threadlib.m4
+++ b/lib/gl/m4/threadlib.m4
@@ -1,4 +1,4 @@
-# threadlib.m4 serial 8 (gettext-0.18.2)
+# threadlib.m4 serial 9 (gettext-0.18.2)
 dnl Copyright (C) 2005-2012 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,7 @@ dnl default is 'no', otherwise it is system dependent. In both cases, the user
 dnl can change the choice through the options --enable-threads=choice or
 dnl --disable-threads.
 dnl Defines at most one of the macros USE_POSIX_THREADS, USE_SOLARIS_THREADS,
-dnl USE_PTH_THREADS, USE_WIN32_THREADS
+dnl USE_PTH_THREADS, USE_WINDOWS_THREADS
 dnl Sets the variables LIBTHREAD and LTLIBTHREAD to the linker options for use
 dnl in a Makefile (LIBTHREAD for use without libtool, LTLIBTHREAD for use with
 dnl libtool).
@@ -53,7 +53,7 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY],
     [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])],
     [m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
   AC_ARG_ENABLE([threads],
-AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
+AC_HELP_STRING([--enable-threads={posix|solaris|pth|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
 AC_HELP_STRING([--disable-threads], [build without multithread safety])]),
     [gl_use_threads=$enableval],
     [if test -n "$gl_use_threads_default"; then
@@ -276,17 +276,19 @@ int main ()
       fi
     fi
     if test -z "$gl_have_pthread"; then
-      if test "$gl_use_threads" = yes || test "$gl_use_threads" = win32; then
-        if { case "$host_os" in
-               mingw*) true;;
-               *) false;;
-             esac
-           }; then
-          gl_threads_api=win32
-          AC_DEFINE([USE_WIN32_THREADS], [1],
-            [Define if the Win32 multithreading API can be used.])
-        fi
-      fi
+      case "$gl_use_threads" in
+        yes | windows | win32) # The 'win32' is for backward compatibility.
+          if { case "$host_os" in
+                 mingw*) true;;
+                 *) false;;
+               esac
+             }; then
+            gl_threads_api=windows
+            AC_DEFINE([USE_WINDOWS_THREADS], [1],
+              [Define if the native Windows multithreading API can be used.])
+          fi
+          ;;
+      esac
     fi
   fi
   AC_MSG_CHECKING([for multithread API to use])
@@ -358,7 +360,7 @@ dnl Cygwin            posix       -lpthread       Y      OK
 dnl
 dnl Any of the above  pth         -lpth                  0.0
 dnl
-dnl Mingw             win32                       N      OK
+dnl Mingw             windows                     N      OK
 dnl
 dnl BeOS 5            --
 dnl
diff --git a/lib/gl/strverscmp.c b/lib/gl/strverscmp.c
index e1093fb..5456519 100644
--- a/lib/gl/strverscmp.c
+++ b/lib/gl/strverscmp.c
@@ -43,7 +43,7 @@
    - It's typically faster.
    POSIX says that only '0' through '9' are digits.  Prefer ISDIGIT to
    isdigit unless it's important to use the locale's definition
-   of `digit' even when the host does not conform to POSIX.  */
+   of "digit" even when the host does not conform to POSIX.  */
 #define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9)
 
 #undef __strverscmp
diff --git a/lib/gltests/Makefile.am b/lib/gltests/Makefile.am
index df6a4a0..0107ffa 100644
--- a/lib/gltests/Makefile.am
+++ b/lib/gltests/Makefile.am
@@ -148,7 +148,7 @@ BUILT_SOURCES += inttypes.h
 
 # We need the following in order to create <inttypes.h> when the system
 # doesn't have one that works with the given compiler.
-inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
@@ -169,10 +169,12 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_N
 	      -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \
 	      -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
 	      -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
+	      -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
 	      -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
 	      -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \
 	      -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \
 	      -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \
+	      -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
 	      -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
 	      -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
 	      < $(srcdir)/inttypes.in.h; \
diff --git a/lib/gltests/glthread/lock.c b/lib/gltests/glthread/lock.c
index 90cb59d..3ab4fad 100644
--- a/lib/gltests/glthread/lock.c
+++ b/lib/gltests/glthread/lock.c
@@ -630,7 +630,7 @@ glthread_once_singlethreaded (gl_once_t *once_control)
 
 /* ========================================================================= */
 
-#if USE_WIN32_THREADS
+#if USE_WINDOWS_THREADS
 
 /* -------------------------- gl_lock_t datatype -------------------------- */
 
diff --git a/lib/gltests/glthread/lock.h b/lib/gltests/glthread/lock.h
index ab93f20..02377cd 100644
--- a/lib/gltests/glthread/lock.h
+++ b/lib/gltests/glthread/lock.h
@@ -614,7 +614,7 @@ extern int glthread_once_singlethreaded (gl_once_t *once_control);
 
 /* ========================================================================= */
 
-#if USE_WIN32_THREADS
+#if USE_WINDOWS_THREADS
 
 # define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
@@ -623,8 +623,8 @@ extern int glthread_once_singlethreaded (gl_once_t *once_control);
 extern "C" {
 # endif
 
-/* We can use CRITICAL_SECTION directly, rather than the Win32 Event, Mutex,
-   Semaphore types, because
+/* We can use CRITICAL_SECTION directly, rather than the native Windows Event,
+   Mutex, Semaphore types, because
      - we need only to synchronize inside a single process (address space),
        not inter-process locking,
      - we don't need to support trylock operations.  (TryEnterCriticalSection
@@ -710,9 +710,9 @@ extern int glthread_rwlock_destroy_func (gl_rwlock_t *lock);
 
 /* --------------------- gl_recursive_lock_t datatype --------------------- */
 
-/* The Win32 documentation says that CRITICAL_SECTION already implements a
-   recursive lock.  But we need not rely on it: It's easy to implement a
-   recursive lock without this assumption.  */
+/* The native Windows documentation says that CRITICAL_SECTION already
+   implements a recursive lock.  But we need not rely on it: It's easy to
+   implement a recursive lock without this assumption.  */
 
 typedef struct
         {
@@ -764,7 +764,7 @@ extern void glthread_once_func (gl_once_t *once_control, void (*initfunction) (v
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
diff --git a/lib/gltests/glthread/thread.c b/lib/gltests/glthread/thread.c
index 4f13a05..be0a871 100644
--- a/lib/gltests/glthread/thread.c
+++ b/lib/gltests/glthread/thread.c
@@ -43,7 +43,7 @@ const gl_thread_t gl_null_thread /* = { .p = NULL } */;
 
 /* ========================================================================= */
 
-#if USE_WIN32_THREADS
+#if USE_WINDOWS_THREADS
 
 #include <process.h>
 
diff --git a/lib/gltests/glthread/thread.h b/lib/gltests/glthread/thread.h
index 5055c77..b95d6a2 100644
--- a/lib/gltests/glthread/thread.h
+++ b/lib/gltests/glthread/thread.h
@@ -290,7 +290,7 @@ typedef thread_t gl_thread_t;
 
 /* ========================================================================= */
 
-#if USE_WIN32_THREADS
+#if USE_WINDOWS_THREADS
 
 # define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
@@ -337,7 +337,7 @@ extern int gl_thread_exit_func (void *retval);
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
diff --git a/lib/gltests/glthread/yield.h b/lib/gltests/glthread/yield.h
index f030b98..040afe3 100644
--- a/lib/gltests/glthread/yield.h
+++ b/lib/gltests/glthread/yield.h
@@ -89,7 +89,7 @@ extern "C" {
 
 /* ========================================================================= */
 
-#if USE_WIN32_THREADS
+#if USE_WINDOWS_THREADS
 
 # define WIN32_LEAN_AND_MEAN  /* avoid including junk */
 # include <windows.h>
@@ -109,7 +109,7 @@ extern "C" {
 
 /* ========================================================================= */
 
-#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WIN32_THREADS)
+#if !(USE_POSIX_THREADS || USE_PTH_THREADS || USE_SOLARIS_THREADS || USE_WINDOWS_THREADS)
 
 /* Provide dummy implementation if threads are not supported.  */
 
diff --git a/lib/gltests/init.sh b/lib/gltests/init.sh
index 9485492..5985552 100644
--- a/lib/gltests/init.sh
+++ b/lib/gltests/init.sh
@@ -61,7 +61,7 @@ ME_=`expr "./$0" : '.*/\(.*\)$'`
 
 # We use a trap below for cleanup.  This requires us to go through
 # hoops to get the right exit status transported through the handler.
-# So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
+# So use 'Exit STATUS' instead of 'exit STATUS' inside of the tests.
 # Turn off errexit here so that we don't trip the bug with OSF1/Tru64
 # sh inside this function.
 Exit () { set +e; (exit $1); exit $1; }
@@ -172,7 +172,7 @@ else
     if test "$re_shell_" = __current__; then
       # 'eval'ing this code makes Solaris 10's /bin/sh exit with
       # $? set to 2.  It does not evaluate any of the code after the
-      # "unexpected" first `('.  Thus, we must run it in a subshell.
+      # "unexpected" first '('.  Thus, we must run it in a subshell.
       ( eval "$gl_shell_test_script_" ) > /dev/null 2>&1
     else
       "$re_shell_" -c "$gl_shell_test_script_" 2>/dev/null
@@ -255,7 +255,7 @@ compare_dev_null_ ()
   return 2
 }
 
-if diff_out_=`( diff -u "$0" "$0" < /dev/null ) 2>/dev/null`; then
+if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null`; then
   if test -z "$diff_out_"; then
     compare_ () { diff -u "$@"; }
   else
@@ -273,7 +273,7 @@ if diff_out_=`( diff -u "$0" "$0" < /dev/null ) 2>/dev/null`; then
       fi
     }
   fi
-elif diff_out_=`( diff -c "$0" "$0" < /dev/null ) 2>/dev/null`; then
+elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then
   if test -z "$diff_out_"; then
     compare_ () { diff -c "$@"; }
   else
diff --git a/lib/gltests/inttypes.in.h b/lib/gltests/inttypes.in.h
index e08a660..b9da2b5 100644
--- a/lib/gltests/inttypes.in.h
+++ b/lib/gltests/inttypes.in.h
@@ -56,6 +56,8 @@
 # error "This file assumes that 'int' has exactly 32 bits. Please report your platform and compiler to <bug-gnulib@gnu.org>."
 #endif
 
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
 /* The definition of _GL_ARG_NONNULL is copied here.  */
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
@@ -1077,10 +1079,23 @@ _GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - "
 #endif
 
 #if @GNULIB_STRTOIMAX@
-# if !@HAVE_DECL_STRTOIMAX@
-#  undef strtoimax
-extern intmax_t strtoimax (const char *, char **, int) _GL_ARG_NONNULL ((1));
+# if @REPLACE_STRTOIMAX@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strtoimax
+#   define strtoimax rpl_strtoimax
+#  endif
+_GL_FUNCDECL_RPL (strtoimax, intmax_t,
+                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (strtoimax, intmax_t, (const char *, char **, int));
+# else
+#  if !@HAVE_DECL_STRTOIMAX@
+#   undef strtoimax
+_GL_FUNCDECL_SYS (strtoimax, intmax_t,
+                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (strtoimax, intmax_t, (const char *, char **, int));
 # endif
+_GL_CXXALIASWARN (strtoimax);
 #elif defined GNULIB_POSIXCHECK
 # undef strtoimax
 # if HAVE_RAW_DECL_STRTOIMAX
@@ -1092,8 +1107,11 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - "
 #if @GNULIB_STRTOUMAX@
 # if !@HAVE_DECL_STRTOUMAX@
 #  undef strtoumax
-extern uintmax_t strtoumax (const char *, char **, int) _GL_ARG_NONNULL ((1));
+_GL_FUNCDECL_SYS (strtoumax, uintmax_t,
+                  (const char *, char **, int) _GL_ARG_NONNULL ((1)));
 # endif
+_GL_CXXALIAS_SYS (strtoumax, uintmax_t, (const char *, char **, int));
+_GL_CXXALIASWARN (strtoumax);
 #elif defined GNULIB_POSIXCHECK
 # undef strtoumax
 # if HAVE_RAW_DECL_STRTOUMAX
diff --git a/lib/gltests/localename.c b/lib/gltests/localename.c
index 7c39bcd..869dbf2 100644
--- a/lib/gltests/localename.c
+++ b/lib/gltests/localename.c
@@ -15,7 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Ulrich Drepper <drepper@gnu.org>, 1995.  */
-/* Win32 code written by Tor Lillqvist <tml@iki.fi>.  */
+/* Native Windows code written by Tor Lillqvist <tml@iki.fi>.  */
 /* MacOS X code written by Bruno Haible <bruno@clisp.org>.  */
 
 #include <config.h>
@@ -54,10 +54,10 @@
 #endif
 
 #if defined _WIN32 || defined __WIN32__
-# define WIN32_NATIVE
+# define WINDOWS_NATIVE
 #endif
 
-#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
+#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 /* List of language codes, sorted by value:
@@ -1405,11 +1405,11 @@ gl_locale_name_canonicalize (char *name)
 #endif
 
 
-#if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
+#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
 
-/* Canonicalize a Win32 native locale name to a Unix locale name.
+/* Canonicalize a Windows native locale name to a Unix locale name.
    NAME is a sufficiently large buffer.
-   On input, it contains the Win32 locale name.
+   On input, it contains the Windows locale name.
    On output, it contains the Unix locale name.  */
 # if !defined IN_LIBINTL
 static
@@ -1465,9 +1465,9 @@ gl_locale_name_from_win32_LANGID (LANGID langid)
     }
   /* Internet Explorer has an LCID to RFC3066 name mapping stored in
      HKEY_CLASSES_ROOT\Mime\Database\Rfc1766.  But we better don't use that
-     since IE's i18n subsystem is known to be inconsistent with the Win32 base
-     (e.g. they have different character conversion facilities that produce
-     different results).  */
+     since IE's i18n subsystem is known to be inconsistent with the native
+     Windows base (e.g. they have different character conversion facilities
+     that produce different results).  */
   /* Use our own table.  */
   {
     int primary, sub;
@@ -2866,7 +2866,7 @@ gl_locale_name_default (void)
          "C.UTF-8" locale, which operates in the same way as the "C" locale.
   */
 
-#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WIN32_NATIVE || defined __CYGWIN__)
+#if !(HAVE_CFLOCALECOPYCURRENT || HAVE_CFPREFERENCESCOPYAPPVALUE || defined WINDOWS_NATIVE || defined __CYGWIN__)
 
   /* The system does not have a way of setting the locale, other than the
      POSIX specified environment variables.  We use C as default locale.  */
@@ -2921,11 +2921,11 @@ gl_locale_name_default (void)
 
 # endif
 
-# if defined WIN32_NATIVE || defined __CYGWIN__ /* WIN32 or Cygwin */
+# if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
   {
     LCID lcid;
 
-    /* Use native Win32 API locale ID.  */
+    /* Use native Windows API locale ID.  */
     lcid = GetThreadLocale ();
 
     return gl_locale_name_from_win32_LCID (lcid);
diff --git a/lib/gltests/putenv.c b/lib/gltests/putenv.c
index 5f26b66..3c0f7ea 100644
--- a/lib/gltests/putenv.c
+++ b/lib/gltests/putenv.c
@@ -43,7 +43,7 @@ extern char **environ;
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of `environ'.  */
+/* This lock protects against simultaneous modifications of 'environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
@@ -91,7 +91,7 @@ _unsetenv (const char *name)
 
 
 /* Put STRING, which is of the form "NAME=VALUE", in the environment.
-   If STRING contains no `=', then remove STRING from the environment.  */
+   If STRING contains no '=', then remove STRING from the environment.  */
 int
 putenv (char *string)
 {
diff --git a/lib/gltests/setenv.c b/lib/gltests/setenv.c
index 3854a99..8201be2 100644
--- a/lib/gltests/setenv.c
+++ b/lib/gltests/setenv.c
@@ -49,7 +49,7 @@
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of `environ'.  */
+/* This lock protects against simultaneous modifications of 'environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
@@ -103,11 +103,11 @@ static void *known_values;
 static char **last_environ;
 
 
-/* This function is used by `setenv' and `putenv'.  The difference between
+/* This function is used by 'setenv' and 'putenv'.  The difference between
    the two functions is that for the former must create a new string which
-   is then placed in the environment, while the argument of `putenv'
+   is then placed in the environment, while the argument of 'putenv'
    must be used directly.  This is all complicated by the fact that we try
-   to reuse values once generated for a `setenv' call since we can never
+   to reuse values once generated for a 'setenv' call since we can never
    free the strings.  */
 int
 __add_to_environ (const char *name, const char *value, const char *combined,
@@ -299,7 +299,7 @@ setenv (const char *name, const char *value, int replace)
   return __add_to_environ (name, value, NULL, replace);
 }
 
-/* The `clearenv' was planned to be added to POSIX.1 but probably
+/* The 'clearenv' was planned to be added to POSIX.1 but probably
    never made it.  Nevertheless the POSIX.9 standard (POSIX bindings
    for Fortran 77) requires this function.  */
 int
diff --git a/lib/gltests/setlocale.c b/lib/gltests/setlocale.c
index caa1b87..8a47cde 100644
--- a/lib/gltests/setlocale.c
+++ b/lib/gltests/setlocale.c
@@ -74,7 +74,7 @@ category_to_name (int category)
 
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 
-/* The native Win32 setlocale() function expects locale names of the form
+/* The native Windows setlocale() function expects locale names of the form
    "German" or "German_Germany" or "DEU", but not "de" or "de_DE".  We need
    to convert the names from the form with ISO 639 language code and ISO 3166
    country code to the form with English names or with three-letter identifier.
diff --git a/lib/gltests/test-init.sh b/lib/gltests/test-init.sh
index 123da8e..3368a99 100755
--- a/lib/gltests/test-init.sh
+++ b/lib/gltests/test-init.sh
@@ -52,14 +52,20 @@ EOF
   compare empty in >out 2>err && fail=1
   # Remove the TAB-date suffix on each --- and +++ line,
   # for both the expected and the actual output files.
+  # Also remove the @@ line, since Solaris 5.10 and GNU diff formats differ:
+  # -@@ -0,0 +1 @@
+  # +@@ -1,0 +1,1 @@
   cat <<\EOF > exp
 --- empty
 +++ in
-@@ -0,0 +1 @@
 +xyz
 EOF
-  sed 's/	.*//' out > k && mv k out
-  compare exp out || fail=1
+  sed 's/	.*//;/^@@/d' out > k && mv k out
+
+  # Compare against expected output only if compare is using diff -u.
+  if (diff -u out out < /dev/null) > /dev/null 2>&1; then
+    compare exp out || fail=1
+  fi
   case $- in *x*) ;; *) test -s err && fail_ "err not empty: $(cat err)";; esac
 }
 
diff --git a/lib/gltests/test-lock.c b/lib/gltests/test-lock.c
index 15851da..06bb3df 100644
--- a/lib/gltests/test-lock.c
+++ b/lib/gltests/test-lock.c
@@ -18,7 +18,7 @@
 
 #include <config.h>
 
-#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS
+#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS
 
 #if USE_POSIX_THREADS
 # define TEST_POSIX_THREADS 1
@@ -29,8 +29,8 @@
 #if USE_PTH_THREADS
 # define TEST_PTH_THREADS 1
 #endif
-#if USE_WIN32_THREADS
-# define TEST_WIN32_THREADS 1
+#if USE_WINDOWS_THREADS
+# define TEST_WINDOWS_THREADS 1
 #endif
 
 /* Whether to enable locking.
@@ -69,7 +69,7 @@
 # undef USE_POSIX_THREADS
 # undef USE_SOLARIS_THREADS
 # undef USE_PTH_THREADS
-# undef USE_WIN32_THREADS
+# undef USE_WINDOWS_THREADS
 #endif
 #include "glthread/lock.h"
 
@@ -83,8 +83,8 @@
 # if TEST_PTH_THREADS
 #  define USE_PTH_THREADS 1
 # endif
-# if TEST_WIN32_THREADS
-#  define USE_WIN32_THREADS 1
+# if TEST_WINDOWS_THREADS
+#  define USE_WINDOWS_THREADS 1
 # endif
 #endif
 
diff --git a/lib/gltests/test-setlocale2.sh b/lib/gltests/test-setlocale2.sh
index 723e74e..904e147 100755
--- a/lib/gltests/test-setlocale2.sh
+++ b/lib/gltests/test-setlocale2.sh
@@ -2,14 +2,16 @@
 
 # Test locale names with likely unsupported encoding in Unix syntax.
 for name in ar_SA.ISO-8859-1 fr_FR.CP1251 zh_TW.GB18030 zh_CN.BIG5; do
-  LC_ALL=$name ./test-setlocale2${EXEEXT} 1 || exit 1
+  env LC_ALL=$name ./test-setlocale2${EXEEXT} 1 || exit 1
 done
 
 # Test locale names with likely unsupported encoding in native Windows syntax.
 for name in "Arabic_Saudi Arabia.1252" "Arabic_Saudi Arabia.65001" \
             French_France.65001 Japanese_Japan.65001 Turkish_Turkey.65001 \
             Chinese_Taiwan.65001 Chinese_China.54936 Chinese_China.65001; do
-  LC_ALL=$name ./test-setlocale2${EXEEXT} 1 || exit 1
+  # Here we use 'env' to set the LC_ALL environment variable, because on
+  # Solaris 11 2011-11, the /bin/sh refuses to do it for Turkish_Turkey.65001.
+  env LC_ALL="$name" ./test-setlocale2${EXEEXT} 1 || exit 1
 done
 
 exit 0
diff --git a/lib/gltests/test-thread_create.c b/lib/gltests/test-thread_create.c
index 8de098b..0f86771 100644
--- a/lib/gltests/test-thread_create.c
+++ b/lib/gltests/test-thread_create.c
@@ -67,7 +67,7 @@ main ()
     }
   else
     {
-#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WIN32_THREADS
+#if USE_POSIX_THREADS || USE_SOLARIS_THREADS || USE_PTH_THREADS || USE_WINDOWS_THREADS
       fputs ("glthread_create failed\n", stderr);
       return 1;
 #else
diff --git a/lib/gltests/unsetenv.c b/lib/gltests/unsetenv.c
index b1e659b..ddbe9a4 100644
--- a/lib/gltests/unsetenv.c
+++ b/lib/gltests/unsetenv.c
@@ -36,7 +36,7 @@
 #endif
 
 #if _LIBC
-/* This lock protects against simultaneous modifications of `environ'.  */
+/* This lock protects against simultaneous modifications of 'environ'.  */
 # include <bits/libc-lock.h>
 __libc_lock_define_initialized (static, envlock)
 # define LOCK   __libc_lock_lock (envlock)
diff --git a/lib/gltests/verify.h b/lib/gltests/verify.h
index e9d6666..cef14ad 100644
--- a/lib/gltests/verify.h
+++ b/lib/gltests/verify.h
@@ -21,13 +21,11 @@
 # define _GL_VERIFY_H
 
 
-/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per the
-   C1X draft N1548 section 6.7.10.  This is supported by GCC 4.6.0 and
-   later, in C mode, and its use here generates easier-to-read diagnostics
-   when verify (R) fails.
+/* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11.
+   This is supported by GCC 4.6.0 and later, in C mode, and its use
+   here generates easier-to-read diagnostics when verify (R) fails.
 
-   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per the
-   C++0X draft N3242 section 7.(4).
+   Define _GL_HAVE_STATIC_ASSERT to 1 if static_assert works as per C++11.
    This will likely be supported by future GCC versions, in C++ mode.
 
    Use this only with GCC.  If we were willing to slow 'configure'
@@ -188,7 +186,7 @@ template <int w>
    trailing ';'.  If R is false, fail at compile-time, preferably
    with a diagnostic that includes the string-literal DIAGNOSTIC.
 
-   Unfortunately, unlike C1X, this implementation must appear as an
+   Unfortunately, unlike C11, this implementation must appear as an
    ordinary declaration, and cannot appear inside struct { ... }.  */
 
 # ifdef _GL_HAVE__STATIC_ASSERT
@@ -205,7 +203,7 @@ template <int w>
 #   define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC)
 #  endif
 #  if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert
-#   define static_assert _Static_assert /* Draft C1X requires this #define.  */
+#   define static_assert _Static_assert /* C11 requires this #define.  */
 #  endif
 # endif
 
diff --git a/lib/idn-free.c b/lib/idn-free.c
index 862e0ea..651212b 100644
--- a/lib/idn-free.c
+++ b/lib/idn-free.c
@@ -1,24 +1,31 @@
-/* idn-free.c --- Invoke the `free' function releasing memory
- *                allocated by libidn functions.
- * Copyright (C) 2004-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+/* idn-free.h --- Invoke the free function to release memory
+   Copyright (C) 2004-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
diff --git a/lib/idn-free.h b/lib/idn-free.h
index 2abe494..58f3a2a 100644
--- a/lib/idn-free.h
+++ b/lib/idn-free.h
@@ -1,24 +1,31 @@
-/* idn-free.h --- Invoke the `free' function releasing memory
- *                allocated by libidn functions.
- * Copyright (C) 2004-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+/* idn-free.h --- Invoke the free function to release memory
+   Copyright (C) 2004-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef IDN_FREE_H
 # define IDN_FREE_H
diff --git a/lib/idna.c b/lib/idna.c
index 3d76630..9ab413c 100644
--- a/lib/idna.c
+++ b/lib/idna.c
@@ -1,23 +1,31 @@
-/* idna.c --- Convert to or from IDN strings.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+/* idna.c --- Prototypes for Internationalized Domain Name library.
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -515,7 +523,8 @@ idna_to_ascii_4z (const uint32_t * input, char **output, int flags)
 
       if (out)
 	{
-	  char *newp = realloc (out, strlen (out) + 1 + strlen (buf) + 1);
+	  size_t l = strlen (out) + 1 + strlen (buf) + 1;
+	  char *newp = realloc (out, l);
 	  if (!newp)
 	    {
 	      free (out);
@@ -527,7 +536,8 @@ idna_to_ascii_4z (const uint32_t * input, char **output, int flags)
 	}
       else
 	{
-	  out = (char *) malloc (strlen (buf) + 1);
+	  size_t l = strlen (buf) + 1;
+	  out = (char *) malloc (l);
 	  if (!out)
 	    return IDNA_MALLOC_ERROR;
 	  strcpy (out, buf);
diff --git a/lib/idna.h b/lib/idna.h
index 98c43bb..2b58f8a 100644
--- a/lib/idna.h
+++ b/lib/idna.h
@@ -1,23 +1,31 @@
-/* idna.h --- Declarations for Internationalized Domain Name in Applications.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+/* idna.h --- Prototypes for Internationalized Domain Name library.
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef IDNA_H
 # define IDNA_H
diff --git a/lib/libidn.map b/lib/libidn.map
index 34efd2f..07a4e80 100644
--- a/lib/libidn.map
+++ b/lib/libidn.map
@@ -2,19 +2,18 @@
 #
 # This file is part of GNU Libidn.
 #
-# GNU Libidn is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# GNU Libidn is distributed in the hope that it will be useful,
+# This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU Lesser General Public
-# License along with GNU Libidn; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 LIBIDN_1.0
 {
diff --git a/lib/nfkc.c b/lib/nfkc.c
index 45ce569..a52d74b 100644
--- a/lib/nfkc.c
+++ b/lib/nfkc.c
@@ -1,23 +1,31 @@
 /* nfkc.c --- Unicode normalization utilities.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1073,14 +1081,14 @@ stringprep_utf8_nfkc_normalize (const char *str, ssize_t len)
  * @str: a Unicode string.
  * @len: length of @str array, or -1 if @str is nul-terminated.
  *
- * Converts UCS4 string into UTF-8 and runs
- * stringprep_utf8_nfkc_normalize().
+ * Converts a UCS4 string into canonical form, see
+ * stringprep_utf8_nfkc_normalize() for more information.
  *
  * Return value: a newly allocated Unicode string, that is the NFKC
  *   normalized form of @str.
  **/
 uint32_t *
-stringprep_ucs4_nfkc_normalize (uint32_t * str, ssize_t len)
+stringprep_ucs4_nfkc_normalize (const uint32_t * str, ssize_t len)
 {
   char *p;
   uint32_t *result_wc;
diff --git a/lib/pr29.c b/lib/pr29.c
index 98087c3..fcf798d 100644
--- a/lib/pr29.c
+++ b/lib/pr29.c
@@ -1,23 +1,31 @@
 /* pr29.h --- Detect strings that are non-idempotent under NFKC in Unicode 3.2.
- * Copyright (C) 2004-2012 Simon Josefsson.
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2004-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -1256,7 +1264,7 @@ pr29_4 (const uint32_t * in, size_t len)
     if ((row = first_column (in[i])) > 0)
       for (j = i + 1; j < len; j++)
 	if (combinationclass (in[j]))
-	  for (k = j + 1; k < len; j++)
+	  for (k = j + 1; k < len; k++)
 	    if (in_last_column_row (in[k], row))
 	      return PR29_PROBLEM;
 
diff --git a/lib/pr29.h b/lib/pr29.h
index 69f129d..bf1bba1 100644
--- a/lib/pr29.h
+++ b/lib/pr29.h
@@ -1,23 +1,31 @@
 /* pr29.h --- Detect strings which are non-idempotent under NFKC.
- * Copyright (C) 2004-2012 Simon Josefsson.
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2004-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef PR29_H
 # define PR29_H
diff --git a/lib/profiles.c b/lib/profiles.c
index a4290d7..912ee43 100644
--- a/lib/profiles.c
+++ b/lib/profiles.c
@@ -1,23 +1,31 @@
 /* profiles.c --- Definitions of stringprep profiles.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include "stringprep.h"
diff --git a/lib/punycode.c b/lib/punycode.c
index 6e58b2a..9037f51 100644
--- a/lib/punycode.c
+++ b/lib/punycode.c
@@ -1,23 +1,31 @@
 /* punycode.c --- Implementation of punycode used to ASCII encode IDN's.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 /*
  * This file is derived from RFC 3492bis written by Adam M. Costello.
diff --git a/lib/punycode.h b/lib/punycode.h
index c350d7e..0fea6c9 100644
--- a/lib/punycode.h
+++ b/lib/punycode.h
@@ -1,26 +1,35 @@
 /* punycode.h --- Declarations for punycode functions.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 /*
- * This file is derived from RFC 3492bis written by Adam M. Costello.
+ * This file contains content derived from RFC 3492bis written by Adam
+ * M. Costello.
  *
  * Disclaimer and license: Regarding this entire document or any
  * portion of it (including the pseudocode and C code), the author
diff --git a/lib/strerror-idna.c b/lib/strerror-idna.c
index 9660886..2ef181d 100644
--- a/lib/strerror-idna.c
+++ b/lib/strerror-idna.c
@@ -1,23 +1,31 @@
 /* strerror-idna.c --- Convert IDNA errors into text.
- * Copyright (C) 2004-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2004-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/lib/strerror-pr29.c b/lib/strerror-pr29.c
index 4c03c72..003ed59 100644
--- a/lib/strerror-pr29.c
+++ b/lib/strerror-pr29.c
@@ -1,23 +1,31 @@
 /* strerror-pr29.c --- Convert PR29 errors into text.
- * Copyright (C) 2004-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2004-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/lib/strerror-punycode.c b/lib/strerror-punycode.c
index a3b56c1..856b808 100644
--- a/lib/strerror-punycode.c
+++ b/lib/strerror-punycode.c
@@ -1,23 +1,31 @@
 /* strerror-punycode.c --- Convert punycode errors into text.
- * Copyright (C) 2004-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2004-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/lib/strerror-stringprep.c b/lib/strerror-stringprep.c
index db4df94..cb6f636 100644
--- a/lib/strerror-stringprep.c
+++ b/lib/strerror-stringprep.c
@@ -1,23 +1,31 @@
 /* strerror-stringprep.c --- Convert stringprep errors into text.
- * Copyright (C) 2004-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2004-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/lib/strerror-tld.c b/lib/strerror-tld.c
index 1b7133e..7c87fb7 100644
--- a/lib/strerror-tld.c
+++ b/lib/strerror-tld.c
@@ -1,23 +1,31 @@
 /* strerror-tld.c --- Convert TLD errors into text.
- * Copyright (C) 2004-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2004-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/lib/stringprep.c b/lib/stringprep.c
index 6199c9b..4c85970 100644
--- a/lib/stringprep.c
+++ b/lib/stringprep.c
@@ -1,23 +1,31 @@
 /* stringprep.c --- Core stringprep implementation.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/lib/stringprep.h b/lib/stringprep.h
index dddd262..80ae2ed 100644
--- a/lib/stringprep.h
+++ b/lib/stringprep.h
@@ -1,23 +1,31 @@
 /* stringprep.h --- Header file for stringprep functions.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef STRINGPREP_H
 # define STRINGPREP_H
@@ -216,7 +224,7 @@ extern "C"
 
   extern IDNAPI char *stringprep_utf8_nfkc_normalize (const char *str,
 						      ssize_t len);
-  extern IDNAPI uint32_t *stringprep_ucs4_nfkc_normalize (uint32_t * str,
+  extern IDNAPI uint32_t *stringprep_ucs4_nfkc_normalize (const uint32_t * str,
 							  ssize_t len);
 
   extern IDNAPI const char *stringprep_locale_charset (void);
diff --git a/lib/tld.c b/lib/tld.c
index 69817ac..17a1ed9 100644
--- a/lib/tld.c
+++ b/lib/tld.c
@@ -1,26 +1,34 @@
-/* tld.c --- Handle TLD restriction checking.
- * Copyright (C) 2004-2012 Simon Josefsson.
- * Copyright (C) 2003-2012 Free Software Foundation, Inc.
- *
- * Author: Thomas Jacob, Internet24.de
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+/* tld.c --- Declarations for TLD restriction checking.
+   Copyright (C) 2004-2012 Simon Josefsson.
+   Copyright (C) 2003-2012 Free Software Foundation, Inc.
+
+   Author: Thomas Jacob, Internet24.de
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
diff --git a/lib/tld.h b/lib/tld.h
index 9d00602..4d23e6c 100644
--- a/lib/tld.h
+++ b/lib/tld.h
@@ -1,26 +1,34 @@
 /* tld.h --- Declarations for TLD restriction checking.
- * Copyright (C) 2004-2012 Simon Josefsson.
- * Copyright (C) 2003-2012 Free Software Foundation, Inc.
- *
- * Author: Thomas Jacob, Internet24.de
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2004-2012 Simon Josefsson.
+   Copyright (C) 2003-2012 Free Software Foundation, Inc.
+
+   Author: Thomas Jacob, Internet24.de
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef TLD_H
 # define TLD_H
diff --git a/lib/toutf8.c b/lib/toutf8.c
index aabaaf2..c31a826 100644
--- a/lib/toutf8.c
+++ b/lib/toutf8.c
@@ -1,23 +1,31 @@
 /* toutf8.c --- Convert strings from system locale into UTF-8.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is part of GNU Libidn.
- *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * GNU Libidn is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/lib/version.c b/lib/version.c
index bb823ff..843f4b2 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -1,21 +1,31 @@
 /* version.c --- Version handling.
- * Copyright (C) 2002-2012 Simon Josefsson
- *
- * This file is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
+   Copyright (C) 2002-2012 Simon Josefsson
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/libc/example.c b/libc/example.c
index 3c0a255..062efd2 100644
--- a/libc/example.c
+++ b/libc/example.c
@@ -3,19 +3,18 @@
  *
  * This file is part of GNU Libidn.
  *
- * GNU Libidn is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * GNU Libidn is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with GNU Libidn; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/maint.mk b/maint.mk
index 8a1e635..3e16b50 100644
--- a/maint.mk
+++ b/maint.mk
@@ -126,7 +126,7 @@ export LC_ALL = C
 
 _cfg_mk := $(shell test -f $(srcdir)/cfg.mk && echo '$(srcdir)/cfg.mk')
 
-# Collect the names of rules starting with `sc_'.
+# Collect the names of rules starting with 'sc_'.
 syntax-check-rules := $(sort $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' \
 			$(srcdir)/$(ME) $(_cfg_mk)))
 .PHONY: $(syntax-check-rules)
@@ -294,7 +294,7 @@ sc_space_tab:
 	halt='found SPACE-TAB sequence; remove the SPACE'		\
 	  $(_sc_search_regexp)
 
-# Don't use *scanf or the old ato* functions in `real' code.
+# Don't use *scanf or the old ato* functions in "real" code.
 # They provide no error checking mechanism.
 # Instead, use strto* functions.
 sc_prohibit_atoi_atof:
@@ -326,15 +326,15 @@ sc_prohibit_magic_number_exit:
 	  $(_sc_search_regexp)
 
 # Using EXIT_SUCCESS as the first argument to error is misleading,
-# since when that parameter is 0, error does not exit.  Use `0' instead.
+# since when that parameter is 0, error does not exit.  Use '0' instead.
 sc_error_exit_success:
 	@prohibit='error *\(EXIT_SUCCESS,'				\
 	in_vc_files='\.[chly]$$'					\
 	halt='found error (EXIT_SUCCESS'				\
 	 $(_sc_search_regexp)
 
-# `FATAL:' should be fully upper-cased in error messages
-# `WARNING:' should be fully upper-cased, or fully lower-cased
+# "FATAL:" should be fully upper-cased in error messages
+# "WARNING:" should be fully upper-cased, or fully lower-cased
 sc_error_message_warn_fatal:
 	@grep -nEA2 '[^rp]error *\(' $$($(VC_LIST_EXCEPT))		\
 	    | grep -E '"Warning|"Fatal|"fatal' &&			\
@@ -1078,15 +1078,15 @@ sc_po_check:
 
 # Sometimes it is useful to change the PATH environment variable
 # in Makefiles.  When doing so, it's better not to use the Unix-centric
-# path separator of `:', but rather the automake-provided `$(PATH_SEPARATOR)'.
-msg = '$(ME): Do not use `:'\'' above; use $$(PATH_SEPARATOR) instead'
+# path separator of ':', but rather the automake-provided '$(PATH_SEPARATOR)'.
+msg = '$(ME): Do not use '\'':'\'' above; use $$(PATH_SEPARATOR) instead'
 sc_makefile_path_separator_check:
 	@prohibit='PATH[=].*:'						\
 	in_vc_files='akefile|\.mk$$'					\
 	halt=$(msg)							\
 	  $(_sc_search_regexp)
 
-# Check that `make alpha' will not fail at the end of the process,
+# Check that 'make alpha' will not fail at the end of the process,
 # i.e., when pkg-M.N.tar.xz already exists (either in "." or in ../release)
 # and is read-only.
 writable-files:
@@ -1446,9 +1446,9 @@ ifeq (a,b)
 # TS-start
 
 # Most functions should have static scope.
-# Any that don't must be marked with `extern', but `main'
-# and `usage' are exceptions: they're always extern, but
-# do not need to be marked.  Symbols matching `__.*' are
+# Any that don't must be marked with 'extern', but 'main'
+# and 'usage' are exceptions: they're always extern, but
+# do not need to be marked.  Symbols matching '__.*' are
 # reserved by the compiler, so are automatically excluded below.
 _gl_TS_unmarked_extern_functions ?= main usage
 _gl_TS_function_match ?= /^(?:$(_gl_TS_extern)) +.*?(\S+) *\(/
@@ -1458,9 +1458,9 @@ _gl_TS_function_match ?= /^(?:$(_gl_TS_extern)) +.*?(\S+) *\(/
 # export _gl_TS_extern = extern|XTERN
 _gl_TS_extern ?= extern
 
-# The second nm|grep checks for file-scope variables with `extern' scope.
+# The second nm|grep checks for file-scope variables with 'extern' scope.
 # Without gnulib's progname module, you might put program_name here.
-# Symbols matching `__.*' are reserved by the compiler,
+# Symbols matching '__.*' are reserved by the compiler,
 # so are automatically excluded below.
 _gl_TS_unmarked_extern_vars ?=
 
diff --git a/pom.xml.in b/pom.xml.in
index 3080f88..26d53ac 100644
--- a/pom.xml.in
+++ b/pom.xml.in
@@ -13,7 +13,7 @@
   <inceptionYear>2002</inceptionYear>
   <licenses>
     <license>
-      <name>GNU Lesser General Public License version 2.1 or later</name>
+      <name>GNU Lesser General Public License version 3.0 or later</name>
       <url>http://www.gnu.org/licenses/licenses.html</url>
       <distribution>repo</distribution>
     </license>
diff --git a/src/idn.c b/src/idn.c
index 6f60d91..b09762e 100644
--- a/src/idn.c
+++ b/src/idn.c
@@ -48,11 +48,9 @@
 #include "idn_cmd.h"
 
 #define GREETING \
-  "Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Simon Josefsson.\n" \
-  "GNU Libidn comes with NO WARRANTY, to the extent permitted by law.\n" \
-  "You may redistribute copies of GNU Libidn under the terms of\n"	\
-  "the GNU Lesser General Public License.  For more information\n"	\
-  "about these matters, see the file named COPYING.LIB.\n"
+  "Copyright 2002-2012 Simon Josefsson.\n"				 \
+  "GNU Libidn is free software with ABSOLUTELY NO WARRANTY.  For more\n" \
+  "information about these matters, see <http://www.gnu.org/licenses/>.\n"
 
 const char version_etc_copyright[] =
   /* Do *not* mark this string for translation.  %s is a copyright
diff --git a/tests/tst_pr29.c b/tests/tst_pr29.c
index 7d26ce7..4668c02 100644
--- a/tests/tst_pr29.c
+++ b/tests/tst_pr29.c
@@ -52,7 +52,7 @@ static const struct tv tv[] = {
    PR29_PROBLEM},
   {
    "Instability Example",
-   3,
+   4,
    {0x1100, 0x0300, 0x1161, 0x0323, 0},
    PR29_PROBLEM},
   {
@@ -79,7 +79,13 @@ static const struct tv tv[] = {
    "Not a problem sequence 5",
    3,
    {0x1100, 0x00AA, 0x1161, 0},
-   PR29_SUCCESS}
+   PR29_SUCCESS},
+  {
+    /* http://lists.gnu.org/archive/html/help-libidn/2012-01/msg00008.html */
+    "Infloop",
+    3,
+    {0x1100, 0x0300, 0x4711, 0},
+    PR29_SUCCESS}
 };
 
 void
@@ -91,12 +97,24 @@ doit (void)
   for (i = 0; i < sizeof (tv) / sizeof (tv[0]); i++)
     {
       if (debug)
-	printf ("PR29 entry %ld: %s\n", i, tv[i].name);
-
-      if (debug)
 	{
+	  uint32_t *p, *q;
+
+	  printf ("PR29 entry %ld: %s\n", i, tv[i].name);
+
 	  printf ("in:\n");
 	  ucs4print (tv[i].in, tv[i].inlen);
+
+	  printf ("nfkc:\n");
+	  p = stringprep_ucs4_nfkc_normalize (tv[i].in, tv[i].inlen);
+	  ucs4print (p, -1);
+
+	  printf ("second nfkc:\n");
+	  q = stringprep_ucs4_nfkc_normalize (p, -1);
+	  ucs4print (q, -1);
+
+	  free (p);
+	  free (q);
 	}
 
       rc = pr29_4 (tv[i].in, tv[i].inlen);
@@ -141,6 +159,11 @@ doit (void)
       }
 
       if (debug)
-	printf ("OK\n");
+	{
+	  if (tv[i].rc != PR29_SUCCESS)
+	    printf ("EXPECTED FAIL\n");
+	  else
+	    printf ("OK\n");
+	}
     }
 }
diff --git a/tests/utils.c b/tests/utils.c
index 2999778..15e4049 100644
--- a/tests/utils.c
+++ b/tests/utils.c
@@ -112,7 +112,7 @@ ucs4print (const uint32_t * str, size_t len)
   size_t i;
 
   printf ("\t;; ");
-  for (i = 0; i < len; i++)
+  for (i = 0; (len == (size_t) -1) ? str[i] : i < len; i++)
     {
       printf ("U+%04x ", str[i]);
       if ((i + 1) % 4 == 0)
diff --git a/win32/include/ac-stdint.h b/win32/include/ac-stdint.h
index ee58092..e5be451 100644
--- a/win32/include/ac-stdint.h
+++ b/win32/include/ac-stdint.h
@@ -1,20 +1,31 @@
 /* Copyright (C) 2008-2012 Free Software Foundation, Inc.
    Written by Adam Strzelecki <ono@java.pl>
 
-   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 the Free Software Foundation; either version 2.1,
-   or (at your option) any later version.
+   This file is part of GNU Libidn.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
+   General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef _AC_STDINT_H
 #define _AC_STDINT_H 1
diff --git a/win32/include/config.h b/win32/include/config.h
index f341833..4cc8274 100644
--- a/win32/include/config.h
+++ b/win32/include/config.h
@@ -1,3 +1,32 @@
+/* config.h --- System definitions for Windows
+   Copyright (C) 2008-2012 Free Software Foundation, Inc.
+
+   This file is part of GNU Libidn.
+
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
+
 #ifndef _CONFIG_H
 #define _CONFIG_H
 
diff --git a/win32/include/idn-int.h b/win32/include/idn-int.h
index 7478f43..ca86658 100644
--- a/win32/include/idn-int.h
+++ b/win32/include/idn-int.h
@@ -1,19 +1,30 @@
 /* Copyright (C) 2008-2012 Free Software Foundation, Inc.
    Written by Adam Strzelecki <ono@java.pl>
 
-   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 the Free Software Foundation; either version 2.1,
-   or (at your option) any later version.
+   This file is part of GNU Libidn.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
+   General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #include "ac-stdint.h"
diff --git a/win32/include/stdbool.h b/win32/include/stdbool.h
index d10a6da..2a1eb8f 100644
--- a/win32/include/stdbool.h
+++ b/win32/include/stdbool.h
@@ -1,20 +1,31 @@
 /* Copyright (C) 2008-2012 Free Software Foundation, Inc.
    Written by Adam Strzelecki <ono@java.pl>
 
-   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 the Free Software Foundation; either version 2.1,
-   or (at your option) any later version.
+   This file is part of GNU Libidn.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
+   GNU Libidn is free software: you can redistribute it and/or
+   modify it under the terms of either:
+
+     * the GNU Lesser General Public License as published by the Free
+       Software Foundation; either version 3 of the License, or (at
+       your option) any later version.
+
+   or
+
+     * the GNU General Public License as published by the Free
+       Software Foundation; either version 2 of the License, or (at
+       your option) any later version.
+
+   or both in parallel, as here.
+
+   GNU Libidn is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
+   General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   You should have received copies of the GNU General Public License and
+   the GNU Lesser General Public License along with this program.  If
+   not, see <http://www.gnu.org/licenses/>. */
 
 #ifndef _STDBOOL_H
 #define _STDBOOL_H


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Sun Jan 08 18:54:02 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Rk2Ys-0000wG-4Q
	for mharc-libidn-commit@gnu.org; Sun, 08 Jan 2012 18:54:02 -0500
Received: from eggs.gnu.org ([140.186.70.92]:36084)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Rk2Yp-0000vy-6T
	for libidn-commit@gnu.org; Sun, 08 Jan 2012 18:54:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>) id 1Rk2Yn-0003Jx-QO
	for libidn-commit@gnu.org; Sun, 08 Jan 2012 18:53:59 -0500
Received: from mailservice.tudelft.nl ([130.161.131.5]:48709)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>)
	id 1Rk2Yn-0003Jl-Hn; Sun, 08 Jan 2012 18:53:57 -0500
Received: from localhost (localhost [127.0.0.1])
	by amavis (Postfix) with ESMTP id E47517F8014;
	Mon,  9 Jan 2012 00:53:55 +0100 (CET)
X-Quarantine-ID: <kl_ctDYsgIjU>
X-Virus-Scanned: amavisd-new at tudelft.nl
X-Amavis-Alert: BAD HEADER SECTION, Non-encoded 8-bit data (char C3 hex): To:
	...ommit@gnu.org, Ludovic Court\303\250s <ludo@gnu.org>
Received: from mailservice.tudelft.nl ([130.161.131.69])
	by localhost (tudelft.nl [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id kl_ctDYsgIjU; Mon,  9 Jan 2012 00:53:54 +0100 (CET)
Received: from lucifer (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by mx1.tudelft.nl (Postfix) with SMTP id BCC3D7F8019;
	Mon,  9 Jan 2012 00:53:53 +0100 (CET)
Received: by lucifer (sSMTP sendmail emulation);
	Mon, 09 Jan 2012 00:53:53 +0100
To: libidn-commit@gnu.org, Ludovic CourtÃ¨s <ludo@gnu.org>
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Subject: Hydra job gnu:libidn-master:tarball build 1788039: Failed
X-Hydra-Instance: lucifer
X-Hydra-Project: gnu
X-Hydra-Jobset: libidn-master
X-Hydra-Job: tarball
Date: Mon, 9 Jan 2012 00:53:53 +0100
Message-Id: <20120108235353.BCC3D7F8019@mx1.tudelft.nl>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 130.161.131.5
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Jan 2012 23:54:00 -0000

Hi,

This is to let you know that Hydra build 1788039 of job gnu:libidn-master:tarball has changed from 'Success' to 'Failed'.

Complete build information can be found on this page: http://hydra.nixos.org/build/1788039

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 1788039
Nix name:              | libidn-tarball-0pre74ea8682cbb89e45867425082959966cdec56b23
Short description:     | Build of a source distribution from a checkout
Maintainer(s):         | libidn-commit@gnu.org, Ludovic CourtÃ¨s <ludo@gnu.org>
System:                | x86_64-linux
Derivation store path: | /nix/store/n0q2fvcizqva8ghi0bnkghfg03h3xa85-libidn-tarball-0pre74ea8682cbb89e45867425082959966cdec56b23.drv
Output store path:     | /nix/store/czmjnvnrrlhw5zd3c7yg7v9kf2g17802-libidn-tarball-0pre74ea8682cbb89e45867425082959966cdec56b23
Time added:            | 2012-01-09 00:53:53
Build started:         | 2012-01-09 00:50:32
Build finished:        | 2012-01-09 00:53:53
Duration:              | 201s

The build inputs were:

Name        | Type | Value
------------+------+--------------------------------------------------------------------------------------
hydraConfig | git  | git://git.savannah.gnu.org/hydra-recipes.git:706785337060141c72a2ed1770eb6b0405c62e48
nixpkgs     | svn  | https://nixos.org/repos/nix/nixpkgs/trunk:31447
libidnSrc   | git  | git://git.sv.gnu.org/libidn.git:74ea8682cbb89e45867425082959966cdec56b23

Regards,

The Hydra build daemon.

---
I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd
../libidn-docs.sgml:7: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
]>
  ^
../libidn-docs.sgml:82: namespace error : Namespace prefix xi on include is not defined
    <xi:include href="xml/idna.xml"/>
                                   ^
../libidn-docs.sgml:83: namespace error : Namespace prefix xi on include is not defined
    <xi:include href="xml/stringprep.xml"/>
                                         ^
../libidn-docs.sgml:84: namespace error : Namespace prefix xi on include is not defined
    <xi:include href="xml/punycode.xml"/>
                                       ^
../libidn-docs.sgml:85: namespace error : Namespace prefix xi on include is not defined
    <xi:include href="xml/pr29.xml"/>
                                   ^
../libidn-docs.sgml:86: namespace error : Namespace prefix xi on include is not defined
    <xi:include href="xml/tld.xml"/>
                                  ^
../libidn-docs.sgml:87: namespace error : Namespace prefix xi on include is not defined
    <xi:include href="xml/idn-free.xml"/>
                                       ^
../libidn-docs.sgml:89: parser error : Opening and ending tag mismatch: para line 67 and chapter
  </chapter>
            ^
../libidn-docs.sgml:92: namespace error : Namespace prefix xi on include is not defined
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
                                             ^
../libidn-docs.sgml:92: namespace error : Namespace prefix xi on fallback is not defined
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
                                                           ^
../libidn-docs.sgml:94: parser error : Opening and ending tag mismatch: chapter line 18 and book
</book>
       ^
../libidn-docs.sgml:95: parser error : Premature end of data in tag book line 8

^
unable to parse ../libidn-docs.sgml
make[4]: *** [html-build.stamp] Error 6
make[4]: Leaving directory `/tmp/nix-build-n0q2fvcizqva8ghi0bnkghfg03h3xa85-libidn-tarball-0pre74ea8682cbb89e45867425082959966cdec56b23.drv-0/git-export/doc/reference'
make[3]: *** [all-recursive] Error 1
make[3]: Leaving directory `/tmp/nix-build-n0q2fvcizqva8ghi0bnkghfg03h3xa85-libidn-tarball-0pre74ea8682cbb89e45867425082959966cdec56b23.drv-0/git-export/doc'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/tmp/nix-build-n0q2fvcizqva8ghi0bnkghfg03h3xa85-libidn-tarball-0pre74ea8682cbb89e45867425082959966cdec56b23.drv-0/git-export/doc'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/tmp/nix-build-n0q2fvcizqva8ghi0bnkghfg03h3xa85-libidn-tarball-0pre74ea8682cbb89e45867425082959966cdec56b23.drv-0/git-export'
make: *** [all] Error 2
build time elapsed:  0m0.041s 0m0.017s 0m58.476s 0m21.188s
Copying build directory to /nix/store/czmjnvnrrlhw5zd3c7yg7v9kf2g17802-libidn-tarball-0pre74ea8682cbb89e45867425082959966cdec56b23/nix-build-n0q2fvcizqva8ghi0bnkghfg03h3xa85-libidn-tarball-0pre74ea8682cbb89e45867425082959966cdec56b23.drv-0
build failed with exit code 2 (ignored)


From MAILER-DAEMON Mon Jan 09 15:51:34 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RkMBp-0001yS-Vn
	for mharc-libidn-commit@gnu.org; Mon, 09 Jan 2012 15:51:33 -0500
Received: from eggs.gnu.org ([140.186.70.92]:40626)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkMBn-0001te-8t
	for libidn-commit@gnu.org; Mon, 09 Jan 2012 15:51:32 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkMBl-0000Is-HC
	for libidn-commit@gnu.org; Mon, 09 Jan 2012 15:51:31 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:59129)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkMBl-0000Io-EW
	for libidn-commit@gnu.org; Mon, 09 Jan 2012 15:51:29 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkMBl-00032C-2O
	for libidn-commit@gnu.org; Mon, 09 Jan 2012 20:51:29 +0000
Date: Mon, 09 Jan 2012 20:51:29 +0000
Message-Id: <E1RkMBl-00032C-2O@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-23-30-g79b0e6f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 74ea8682cbb89e45867425082959966cdec56b23
X-Git-Newrev: 79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2012 20:51:32 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8

The branch, master has been updated
       via  79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8 (commit)
      from  74ea8682cbb89e45867425082959966cdec56b23 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 9 21:51:20 2012 +0100

    Fix markup.

-----------------------------------------------------------------------

Summary of changes:
 doc/reference/libidn-docs.sgml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/doc/reference/libidn-docs.sgml b/doc/reference/libidn-docs.sgml
index a432b9d..bf260f6 100644
--- a/doc/reference/libidn-docs.sgml
+++ b/doc/reference/libidn-docs.sgml
@@ -67,6 +67,7 @@ included.
     <para>
 Also included is a command line tool, several self tests, code
 examples, and more.
+    </para>
 
     <para>
       The internal layout of the library, and how your application


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Mon Jan 09 15:55:17 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RkMFR-0002EV-Pz
	for mharc-libidn-commit@gnu.org; Mon, 09 Jan 2012 15:55:17 -0500
Received: from eggs.gnu.org ([140.186.70.92]:33142)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>) id 1RkMFO-0002EJ-VO
	for libidn-commit@gnu.org; Mon, 09 Jan 2012 15:55:16 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>) id 1RkMFN-0000vs-Qd
	for libidn-commit@gnu.org; Mon, 09 Jan 2012 15:55:14 -0500
Received: from mailservice.tudelft.nl ([130.161.131.5]:48403)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <e.dolstra@tudelft.nl>)
	id 1RkMFN-0000vk-KE; Mon, 09 Jan 2012 15:55:13 -0500
Received: from localhost (localhost [127.0.0.1])
	by amavis (Postfix) with ESMTP id 74DA1CC04E;
	Mon,  9 Jan 2012 21:55:12 +0100 (CET)
X-Quarantine-ID: <Qxp-ZLwafGJZ>
X-Virus-Scanned: amavisd-new at tudelft.nl
X-Amavis-Alert: BAD HEADER SECTION, Non-encoded 8-bit data (char C3 hex): To:
	...ommit@gnu.org, Ludovic Court\303\250s <ludo@gnu.org>
Received: from mailservice.tudelft.nl ([130.161.131.71])
	by localhost (tudelft.nl [127.0.0.1]) (amavisd-new, port 10026)
	with ESMTP id Qxp-ZLwafGJZ; Mon,  9 Jan 2012 21:55:11 +0100 (CET)
Received: from lucifer (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by mx4.tudelft.nl (Postfix) with SMTP id B197FCC046;
	Mon,  9 Jan 2012 21:55:10 +0100 (CET)
Received: by lucifer (sSMTP sendmail emulation);
	Mon, 09 Jan 2012 21:55:10 +0100
To: libidn-commit@gnu.org, Ludovic CourtÃ¨s <ludo@gnu.org>
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
Subject: Hydra job gnu:libidn-master:tarball build 1789345: Success
X-Hydra-Instance: lucifer
X-Hydra-Project: gnu
X-Hydra-Jobset: libidn-master
X-Hydra-Job: tarball
Date: Mon, 9 Jan 2012 21:55:10 +0100
Message-Id: <20120109205510.B197FCC046@mx4.tudelft.nl>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 130.161.131.5
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2012 20:55:16 -0000

Hi,

This is to let you know that Hydra build 1789345 of job gnu:libidn-master:tarball has changed from 'Failed' to 'Success'.

Complete build information can be found on this page: http://hydra.nixos.org/build/1789345

A summary of the build information follows:

Build ID:              | 1789345
Nix name:              | libidn-tarball-0pre79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8
Short description:     | Build of a source distribution from a checkout
Maintainer(s):         | libidn-commit@gnu.org, Ludovic CourtÃ¨s <ludo@gnu.org>
System:                | x86_64-linux
Derivation store path: | /nix/store/z5h9pz1h03mdinmc9jdrjaskj2gr3qhd-libidn-tarball-0pre79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8.drv
Output store path:     | /nix/store/2j1zb9y3vqvplc8z8y9cfnzyxvkxdqr8-libidn-tarball-0pre79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8
Time added:            | 2012-01-09 21:55:10
Build started:         | 2012-01-09 21:51:47
Build finished:        | 2012-01-09 21:55:10
Duration:              | 203s

The build inputs were:

Name        | Type | Value
------------+------+--------------------------------------------------------------------------------------
hydraConfig | git  | git://git.savannah.gnu.org/hydra-recipes.git:706785337060141c72a2ed1770eb6b0405c62e48
nixpkgs     | svn  | https://nixos.org/repos/nix/nixpkgs/trunk:31458
libidnSrc   | git  | git://git.sv.gnu.org/libidn.git:79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8

Regards,

The Hydra build daemon.


From MAILER-DAEMON Tue Jan 10 15:33:37 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RkiO1-0000LV-HC
	for mharc-libidn-commit@gnu.org; Tue, 10 Jan 2012 15:33:37 -0500
Received: from eggs.gnu.org ([140.186.70.92]:47582)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkiNu-0000K7-1i
	for libidn-commit@gnu.org; Tue, 10 Jan 2012 15:33:33 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkiNp-0003cy-Ig
	for libidn-commit@gnu.org; Tue, 10 Jan 2012 15:33:29 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:32801)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkiNp-0003cg-Gp
	for libidn-commit@gnu.org; Tue, 10 Jan 2012 15:33:25 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkiNo-0008RR-7s
	for libidn-commit@gnu.org; Tue, 10 Jan 2012 20:33:24 +0000
Date: Tue, 10 Jan 2012 20:33:24 +0000
Message-Id: <E1RkiNo-0008RR-7s@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-23-32-gf1ede53
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8
X-Git-Newrev: f1ede53707d894ab67c9eef4e84017342466c148
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2012 20:33:33 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=f1ede53707d894ab67c9eef4e84017342466c148

The branch, master has been updated
       via  f1ede53707d894ab67c9eef4e84017342466c148 (commit)
       via  ef2e20fc09690281cb165c17addc2d4619a386ae (commit)
      from  79b0e6f6c7e22db52b193be0b1a4f05795a6c5b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f1ede53707d894ab67c9eef4e84017342466c148
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jan 10 21:33:17 2012 +0100

    Generated.

commit ef2e20fc09690281cb165c17addc2d4619a386ae
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jan 10 21:22:46 2012 +0100

    Version 1.24.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |  380 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 NEWS      |    2 +-
 2 files changed, 381 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fc5d454..65c82c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,383 @@
+2012-01-10  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS: Version 1.24.
+
+2012-01-09  Simon Josefsson <simon@josefsson.org>
+
+	* doc/reference/libidn-docs.sgml: Fix markup.
+
+2012-01-09  Simon Josefsson <simon@josefsson.org>
+
+	* doc/reference/libidn-docs.sgml: Sync intro texts.
+
+2012-01-09  Simon Josefsson <simon@josefsson.org>
+
+	* Makefile.am: Also dist COPYING* files.
+
+2012-01-09  Simon Josefsson <simon@josefsson.org>
+
+	* gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4,
+	lib/gltests/test-setlocale2.sh: Update gnulib files.
+
+2012-01-09  Simon Josefsson <simon@josefsson.org>
+
+	* tests/tst_pr29.c, tests/utils.c: tst_pr29: Print more debug info.
+
+2012-01-09  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, lib/nfkc.c, lib/stringprep.h: libidn: Add 'const' keyword to
+	'stringprep_ucs4_nfkc_normalize' function.
+
+2012-01-08  Simon Josefsson <simon@josefsson.org>
+
+	* tests/tst_pr29.c: Fix typo.
+
+2012-01-08  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, THANKS, lib/pr29.c, tests/tst_pr29.c: libidn: Fix potential
+	infloop in pr29 code.  Reported by Jon Nelson <jnelson@jamponi.net> in
+
+	<http://lists.gnu.org/archive/html/help-libidn/2012-01/msg00008.html>.
+
+2012-01-08  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS: Fix.
+
+2012-01-08  Simon Josefsson <simon@josefsson.org>
+
+	* doc/Makefile.am, doc/gpl-3.0.texi, doc/lgpl-3.0.texi: Cleanup
+	copyright info.
+
+2012-01-08  Simon Josefsson <simon@josefsson.org>
+
+	* GNUmakefile, build-aux/gnupload,
+	build-aux/useless-if-before-free, gl/Makefile.am, gl/error.c,
+	gl/error.h, gl/getopt.c, gl/getopt.in.h, gl/getopt1.c,
+	gl/getopt_int.h, gl/m4/alloca.m4, gl/m4/extensions.m4,
+	gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4,
+	gl/m4/gnulib-comp.m4, gl/m4/include_next.m4, gl/m4/inttypes.m4,
+	gl/m4/longlong.m4, gl/m4/lstat.m4, gl/m4/time_h.m4,
+	gl/msvc-inval.h, gl/verify.h, gl/version-etc.h,
+	gltests/Makefile.am, gltests/fcntl.in.h, gltests/getcwd-lgpl.c,
+	gltests/init.sh, gltests/inttypes.in.h, gltests/lstat.c,
+	gltests/putenv.c, gltests/setenv.c, gltests/test-init.sh,
+	gltests/unsetenv.c, lib/gl/m4/alloca.m4, lib/gl/m4/extensions.m4,
+	lib/gl/m4/gnulib-common.m4, lib/gl/m4/include_next.m4,
+	lib/gl/m4/inttypes.m4, lib/gl/m4/ld-version-script.m4,
+	lib/gl/m4/longlong.m4, lib/gl/strverscmp.c,
+	lib/gltests/Makefile.am, lib/gltests/init.sh,
+	lib/gltests/inttypes.in.h, lib/gltests/putenv.c,
+	lib/gltests/setenv.c, lib/gltests/test-init.sh,
+	lib/gltests/unsetenv.c, lib/gltests/verify.h, maint.mk: Update
+	gnulib files.
+
+2012-01-08  Simon Josefsson <simon@josefsson.org>
+
+	* COPYING, COPYING.LESSERv2, COPYING.LESSERv3, COPYING.LIB,
+	COPYINGv2, COPYINGv3, NEWS, README, csharp/AssemblyInfo.cs,
+	csharp/IDNA.cs, csharp/IDNAException.cs, csharp/Makefile.am,
+	csharp/NFKC.cs, csharp/Punycode.cs, csharp/PunycodeException.cs,
+	csharp/Stringprep.cs, csharp/StringprepException.cs,
+	csharp/generate/AssemblyInfo.cs, csharp/generate/GenerateNFKC.cs,
+	csharp/generate/GenerateRFC3454.cs, csharp/generate/HashSet.cs,
+	csharp/generate/Program.cs, csharp/generate/Tokenizer.cs,
+	doc/lgpl-2.1.texi, doc/lgpl-3.0.texi, doc/libidn.texi,
+	doc/reference/libidn-docs.sgml, gl/m4/gnulib-cache.m4,
+	java/Makefile.am, java/gnu/Makefile.am, java/gnu/inet/Makefile.am,
+	java/gnu/inet/encoding/IDNA.java,
+	java/gnu/inet/encoding/IDNAException.java,
+	java/gnu/inet/encoding/Makefile.am,
+	java/gnu/inet/encoding/NFKC.java,
+	java/gnu/inet/encoding/Punycode.java,
+	java/gnu/inet/encoding/PunycodeException.java,
+	java/gnu/inet/encoding/Stringprep.java,
+	java/gnu/inet/encoding/StringprepException.java,
+	java/misc/GenerateNFKC.java, java/misc/GenerateRFC3454.java,
+	java/misc/Makefile.am, java/misc/TestIDNA.java,
+	java/misc/TestNFKC.java, lib/Makefile.am, lib/idn-free.c,
+	lib/idn-free.h, lib/idna.c, lib/idna.h, lib/libidn.map, lib/nfkc.c,
+	lib/pr29.c, lib/pr29.h, lib/profiles.c, lib/punycode.c,
+	lib/punycode.h, lib/strerror-idna.c, lib/strerror-pr29.c,
+	lib/strerror-punycode.c, lib/strerror-stringprep.c,
+	lib/strerror-tld.c, lib/stringprep.c, lib/stringprep.h, lib/tld.c,
+	lib/tld.h, lib/toutf8.c, lib/version.c, libc/example.c, pom.xml.in,
+	src/idn.c, win32/include/ac-stdint.h, win32/include/config.h,
+	win32/include/idn-int.h, win32/include/stdbool.h: Relicense
+	libraries from LGPLv2+ to dual-GPLv2+|LGPLv3+.
+
+2012-01-05  Simon Josefsson <simon@josefsson.org>
+
+	* lib/idna.c: Put strlen calls in its own line, to simplify valgrind
+	output analysis.
+
+2012-01-05  Simon Josefsson <simon@josefsson.org>
+
+	* gl/error.c, gl/msvc-inval.c, gl/msvc-nothrow.c, gltests/dup2.c,
+	gltests/stdio.in.h, gltests/test-dup2.c,
+	gltests/test-vc-list-files-cvs.sh, lib/gl/m4/locale-fr.m4,
+	lib/gl/m4/locale-ja.m4, lib/gl/m4/locale-tr.m4,
+	lib/gl/m4/locale-zh.m4, lib/gl/m4/threadlib.m4,
+	lib/gltests/glthread/lock.c, lib/gltests/glthread/lock.h,
+	lib/gltests/glthread/thread.c, lib/gltests/glthread/thread.h,
+	lib/gltests/glthread/yield.h, lib/gltests/localename.c,
+	lib/gltests/setlocale.c, lib/gltests/test-lock.c,
+	lib/gltests/test-thread_create.c: Update gnulib files.
+
+2012-01-05  Simon Josefsson <simon@josefsson.org>
+
+	* HACKING, Makefile.am, README-alpha: Rename README-alpha to HACKING
+	and include it in tarballs.
+
+2012-01-05  Simon Josefsson <simon@josefsson.org>
+
+	* configure.ac: Print whether libiconv was found.
+
+2012-01-03  Simon Josefsson <simon@josefsson.org>
+
+	* GNUmakefile, build-aux/config.rpath, build-aux/csharpcomp.sh.in,
+	build-aux/csharpexec.sh.in, build-aux/pmccabe2html,
+	build-aux/snippet/arg-nonnull.h, build-aux/snippet/c++defs.h,
+	build-aux/snippet/unused-parameter.h,
+	build-aux/snippet/warn-on-use.h, build-aux/update-copyright,
+	build-aux/useless-if-before-free, build-aux/vc-list-files,
+	gl/Makefile.am, gl/errno.in.h, gl/error.c, gl/error.h, gl/getopt.c,
+	gl/getopt.in.h, gl/getopt1.c, gl/getopt_int.h, gl/gettext.h,
+	gl/intprops.h, gl/m4/00gnulib.m4, gl/m4/alloca.m4,
+	gl/m4/autobuild.m4, gl/m4/close.m4, gl/m4/csharp.m4,
+	gl/m4/csharpcomp.m4, gl/m4/csharpexec.m4, gl/m4/dup2.m4,
+	gl/m4/eealloc.m4, gl/m4/environ.m4, gl/m4/errno_h.m4,
+	gl/m4/error.m4, gl/m4/extensions.m4, gl/m4/fcntl-o.m4,
+	gl/m4/fcntl_h.m4, gl/m4/fdopen.m4, gl/m4/fstat.m4, gl/m4/getcwd.m4,
+	gl/m4/getopt.m4, gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4,
+	gl/m4/gnulib-comp.m4, gl/m4/gnulib-tool.m4, gl/m4/include_next.m4,
+	gl/m4/inttypes-pri.m4, gl/m4/inttypes.m4, gl/m4/largefile.m4,
+	gl/m4/longlong.m4, gl/m4/lstat.m4, gl/m4/malloc.m4,
+	gl/m4/malloca.m4, gl/m4/manywarnings.m4, gl/m4/mode_t.m4,
+	gl/m4/msvc-inval.m4, gl/m4/msvc-nothrow.m4, gl/m4/multiarch.m4,
+	gl/m4/nocrash.m4, gl/m4/open.m4, gl/m4/pathmax.m4, gl/m4/putenv.m4,
+	gl/m4/setenv.m4, gl/m4/ssize_t.m4, gl/m4/stat.m4, gl/m4/stdarg.m4,
+	gl/m4/stdbool.m4, gl/m4/stddef_h.m4, gl/m4/stdint.m4,
+	gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/strerror.m4,
+	gl/m4/string_h.m4, gl/m4/symlink.m4, gl/m4/sys_socket_h.m4,
+	gl/m4/sys_stat_h.m4, gl/m4/time_h.m4, gl/m4/unistd_h.m4,
+	gl/m4/valgrind-tests.m4, gl/m4/version-etc.m4,
+	gl/m4/warn-on-use.m4, gl/m4/warnings.m4, gl/m4/wchar_h.m4,
+	gl/m4/wchar_t.m4, gl/m4/wint_t.m4, gl/msvc-inval.c,
+	gl/msvc-inval.h, gl/msvc-nothrow.c, gl/msvc-nothrow.h,
+	gl/progname.c, gl/progname.h, gl/stdarg.in.h, gl/stddef.in.h,
+	gl/strerror-override.c, gl/strerror-override.h, gl/strerror.c,
+	gl/string.in.h, gl/unistd.in.h, gl/verify.h, gl/version-etc.c,
+	gl/version-etc.h, gltests/Makefile.am, gltests/alloca.in.h,
+	gltests/binary-io.h, gltests/close.c, gltests/dosname.h,
+	gltests/dup2.c, gltests/fcntl.in.h, gltests/fd-hook.c,
+	gltests/fd-hook.h, gltests/fdopen.c, gltests/fstat.c,
+	gltests/getcwd-lgpl.c, gltests/ignore-value.h, gltests/init.sh,
+	gltests/inttypes.in.h, gltests/lstat.c, gltests/macros.h,
+	gltests/malloc.c, gltests/malloca.c, gltests/malloca.h,
+	gltests/open.c, gltests/pathmax.h, gltests/putenv.c,
+	gltests/same-inode.h, gltests/setenv.c, gltests/signature.h,
+	gltests/stat.c, gltests/stdbool.in.h, gltests/stdint.in.h,
+	gltests/stdio.in.h, gltests/stdlib.in.h, gltests/symlink.c,
+	gltests/sys_stat.in.h, gltests/test-alloca-opt.c,
+	gltests/test-binary-io.c, gltests/test-close.c,
+	gltests/test-dup2.c, gltests/test-environ.c, gltests/test-errno.c,
+	gltests/test-fdopen.c, gltests/test-fgetc.c, gltests/test-fputc.c,
+	gltests/test-fread.c, gltests/test-fstat.c, gltests/test-fwrite.c,
+	gltests/test-getcwd-lgpl.c, gltests/test-getopt.c,
+	gltests/test-getopt.h, gltests/test-getopt_long.h,
+	gltests/test-ignore-value.c, gltests/test-init.sh,
+	gltests/test-intprops.c, gltests/test-inttypes.c,
+	gltests/test-lstat.c, gltests/test-lstat.h, gltests/test-malloca.c,
+	gltests/test-open.c, gltests/test-open.h, gltests/test-pathmax.c,
+	gltests/test-setenv.c, gltests/test-stat.c, gltests/test-stat.h,
+	gltests/test-stdbool.c, gltests/test-stddef.c,
+	gltests/test-stdint.c, gltests/test-stdio.c,
+	gltests/test-strerror.c, gltests/test-symlink.c,
+	gltests/test-symlink.h, gltests/test-unsetenv.c,
+	gltests/test-vc-list-files-cvs.sh,
+	gltests/test-vc-list-files-git.sh, gltests/test-verify.c,
+	gltests/test-version-etc.c, gltests/test-version-etc.sh,
+	gltests/time.in.h, gltests/unsetenv.c, gltests/version-etc-fsf.c,
+	gltests/wchar.in.h, lib/gl/Makefile.am, lib/gl/c-ctype.c,
+	lib/gl/c-ctype.h, lib/gl/c-strcase.h, lib/gl/c-strcasecmp.c,
+	lib/gl/c-strncasecmp.c, lib/gl/gettext.h, lib/gl/iconv.c,
+	lib/gl/iconv.in.h, lib/gl/iconv_close.c, lib/gl/iconv_open.c,
+	lib/gl/m4/00gnulib.m4, lib/gl/m4/alloca.m4, lib/gl/m4/codeset.m4,
+	lib/gl/m4/eealloc.m4, lib/gl/m4/environ.m4,
+	lib/gl/m4/extensions.m4, lib/gl/m4/gnulib-cache.m4,
+	lib/gl/m4/gnulib-common.m4, lib/gl/m4/gnulib-comp.m4,
+	lib/gl/m4/gnulib-tool.m4, lib/gl/m4/iconv.m4, lib/gl/m4/iconv_h.m4,
+	lib/gl/m4/iconv_open.m4, lib/gl/m4/include_next.m4,
+	lib/gl/m4/inline.m4, lib/gl/m4/intlmacosx.m4,
+	lib/gl/m4/inttypes-pri.m4, lib/gl/m4/inttypes.m4,
+	lib/gl/m4/lcmessage.m4, lib/gl/m4/ld-output-def.m4,
+	lib/gl/m4/ld-version-script.m4, lib/gl/m4/lib-ld.m4,
+	lib/gl/m4/lib-link.m4, lib/gl/m4/lib-prefix.m4,
+	lib/gl/m4/libunistring-base.m4, lib/gl/m4/locale-fr.m4,
+	lib/gl/m4/locale-ja.m4, lib/gl/m4/locale-tr.m4,
+	lib/gl/m4/locale-zh.m4, lib/gl/m4/locale_h.m4,
+	lib/gl/m4/localename.m4, lib/gl/m4/lock.m4, lib/gl/m4/longlong.m4,
+	lib/gl/m4/malloc.m4, lib/gl/m4/malloca.m4, lib/gl/m4/multiarch.m4,
+	lib/gl/m4/putenv.m4, lib/gl/m4/setenv.m4, lib/gl/m4/setlocale.m4,
+	lib/gl/m4/ssize_t.m4, lib/gl/m4/stdbool.m4, lib/gl/m4/stddef_h.m4,
+	lib/gl/m4/stdint.m4, lib/gl/m4/stdlib_h.m4, lib/gl/m4/string_h.m4,
+	lib/gl/m4/strverscmp.m4, lib/gl/m4/thread.m4,
+	lib/gl/m4/threadlib.m4, lib/gl/m4/unistd_h.m4,
+	lib/gl/m4/visibility.m4, lib/gl/m4/warn-on-use.m4,
+	lib/gl/m4/wchar_h.m4, lib/gl/m4/wchar_t.m4, lib/gl/m4/wint_t.m4,
+	lib/gl/m4/yield.m4, lib/gl/stdbool.in.h, lib/gl/stddef.in.h,
+	lib/gl/stdint.in.h, lib/gl/striconv.c, lib/gl/striconv.h,
+	lib/gl/string.in.h, lib/gl/strverscmp.c, lib/gl/unistr.in.h,
+	lib/gl/unistr/u8-mbtoucr.c, lib/gl/unistr/u8-uctomb-aux.c,
+	lib/gl/unistr/u8-uctomb.c, lib/gl/unitypes.in.h,
+	lib/gltests/Makefile.am, lib/gltests/alloca.in.h,
+	lib/gltests/glthread/lock.c, lib/gltests/glthread/lock.h,
+	lib/gltests/glthread/thread.c, lib/gltests/glthread/thread.h,
+	lib/gltests/glthread/threadlib.c, lib/gltests/glthread/yield.h,
+	lib/gltests/init.sh, lib/gltests/intprops.h,
+	lib/gltests/inttypes.in.h, lib/gltests/locale.in.h,
+	lib/gltests/localename.c, lib/gltests/localename.h,
+	lib/gltests/macros.h, lib/gltests/malloc.c, lib/gltests/malloca.c,
+	lib/gltests/malloca.h, lib/gltests/putenv.c, lib/gltests/setenv.c,
+	lib/gltests/setlocale.c, lib/gltests/signature.h,
+	lib/gltests/stdlib.in.h, lib/gltests/test-alloca-opt.c,
+	lib/gltests/test-c-ctype.c, lib/gltests/test-c-strcasecmp.c,
+	lib/gltests/test-c-strncasecmp.c, lib/gltests/test-environ.c,
+	lib/gltests/test-iconv.c, lib/gltests/test-init.sh,
+	lib/gltests/test-intprops.c, lib/gltests/test-inttypes.c,
+	lib/gltests/test-locale.c, lib/gltests/test-localename.c,
+	lib/gltests/test-lock.c, lib/gltests/test-malloca.c,
+	lib/gltests/test-setenv.c, lib/gltests/test-setlocale1.c,
+	lib/gltests/test-setlocale2.c, lib/gltests/test-stdbool.c,
+	lib/gltests/test-stddef.c, lib/gltests/test-stdint.c,
+	lib/gltests/test-stdlib.c, lib/gltests/test-striconv.c,
+	lib/gltests/test-strverscmp.c, lib/gltests/test-sys_wait.h,
+	lib/gltests/test-thread_create.c, lib/gltests/test-thread_self.c,
+	lib/gltests/test-unistd.c, lib/gltests/test-unsetenv.c,
+	lib/gltests/test-verify.c, lib/gltests/unistd.in.h,
+	lib/gltests/unistr/test-u8-mbtoucr.c,
+	lib/gltests/unistr/test-u8-uctomb.c, lib/gltests/unsetenv.c,
+	lib/gltests/verify.h, lib/gltests/wchar.in.h, maint.mk: Update
+	gnulib files.
+
+2012-01-02  Simon Josefsson <simon@josefsson.org>
+
+	* po/rw.po.in: Remove stale translation.
+
+2012-01-02  Simon Josefsson <simon@josefsson.org>
+
+	* cfg.mk, csharp/IDNA.cs, csharp/IDNAException.cs, csharp/NFKC.cs,
+	csharp/Punycode.cs, csharp/PunycodeException.cs,
+	csharp/Stringprep.cs, csharp/StringprepException.cs,
+	csharp/generate/AssemblyInfo.cs, csharp/generate/GenerateNFKC.cs,
+	csharp/generate/GenerateRFC3454.cs, csharp/generate/HashSet.cs,
+	csharp/generate/Program.cs, csharp/generate/Tokenizer.cs,
+	doc/gendocs_template, doc/tld/no.tld,
+	java/gnu/inet/encoding/IDNA.java,
+	java/gnu/inet/encoding/IDNAException.java,
+	java/gnu/inet/encoding/NFKC.java,
+	java/gnu/inet/encoding/Punycode.java,
+	java/gnu/inet/encoding/PunycodeException.java,
+	java/gnu/inet/encoding/Stringprep.java,
+	java/gnu/inet/encoding/StringprepException.java,
+	java/misc/GenerateNFKC.java, java/misc/GenerateRFC3454.java,
+	java/misc/TestIDNA.java, java/misc/TestNFKC.java, lib/Makefile.am,
+	lib/gen-tld-tables.pl, lib/tld.c, lib/tld.h,
+	win32/include/ac-stdint.h, win32/include/idn-int.h,
+	win32/include/stdbool.h: Update FSF copyright years.
+
+2012-01-02  Simon Josefsson <simon@josefsson.org>
+
+	* .clcopying, AUTHORS, ChangeLog, FAQ, Makefile.am, NEWS, README,
+	README-alpha, THANKS, TODO, cfg.mk, configure.ac, contrib/README,
+	contrib/doxygen/gdoc2doxygen, contrib/java/Makefile.am,
+	contrib/java/README, csharp/Makefile.am, doc/Makefile.am,
+	doc/Makefile.gdoci, doc/cyclo/Makefile.am, doc/gdoc,
+	doc/java/Makefile.am, doc/libidn.texi, doc/tld/Makefile.am,
+	doc/tld/README, doc/tld/fr.tld, examples/Makefile.am,
+	examples/README, examples/example.c, examples/example2.c,
+	examples/example3.c, examples/example4.c, examples/example5.c,
+	java/Makefile.am, java/gnu/inet/encoding/Makefile.am,
+	lib/Makefile.am, lib/gen-stringprep-tables.pl,
+	lib/gen-tld-tables.pl, lib/gen-unicode-tables.pl, lib/idn-free.c,
+	lib/idn-free.h, lib/idna.c, lib/idna.h, lib/libidn.map, lib/nfkc.c,
+	lib/pr29.c, lib/pr29.h, lib/profiles.c, lib/punycode.c,
+	lib/punycode.h, lib/strerror-idna.c, lib/strerror-pr29.c,
+	lib/strerror-punycode.c, lib/strerror-stringprep.c,
+	lib/strerror-tld.c, lib/stringprep.c, lib/stringprep.h, lib/tld.c,
+	lib/tld.h, lib/toutf8.c, lib/version.c, libc/README,
+	libc/example.c, libc/getaddrinfo-idn.txt, libidn.pc.in,
+	src/Makefile.am, src/idn.c, src/idn.ggo, src/idna.el,
+	src/punycode.el, tests/Makefile.am, tests/tst_idna.c,
+	tests/tst_idna2.c, tests/tst_idna3.c, tests/tst_idna4.c,
+	tests/tst_nfkc.c, tests/tst_pr29.c, tests/tst_punycode.c,
+	tests/tst_strerror.c, tests/tst_stringprep.c, tests/tst_symbols.c,
+	tests/tst_tld.c, tests/tst_toutf8.c, tests/utils.c, tests/utils.h,
+	win32/libidn4win.mk: Update copyright years.
+
+2011-12-27  Simon Josefsson <simon@josefsson.org>
+
+	* THANKS: Mention gnulib in THANKS.
+
+2011-12-27  Simon Josefsson <simon@josefsson.org>
+
+	* AUTHORS: Update key.
+
+2011-12-27  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, lib/nfkc.c: Sync glib NFKC code and improve
+	copyright/license statements.
+
+2011-12-27  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, po/it.po.in: Sync with TP.
+
+2011-12-27  Simon Josefsson <simon@josefsson.org>
+
+	* gl/Makefile.am, gl/m4/gnulib-comp.m4, gl/m4/inttypes.m4,
+	gl/m4/stdint.m4, gl/m4/unistd_h.m4, gl/unistd.in.h,
+	gltests/Makefile.am, gltests/init.sh, gltests/inttypes.in.h,
+	gltests/stdint.in.h, gltests/test-init.sh, gltests/test-inttypes.c,
+	gltests/test-stdint.c, lib/gl/m4/gnulib-comp.m4,
+	lib/gl/m4/inttypes.m4, lib/gl/m4/stdint.m4, lib/gl/m4/unistd_h.m4,
+	lib/gl/stdint.in.h, lib/gltests/Makefile.am, lib/gltests/init.sh,
+	lib/gltests/inttypes.in.h, lib/gltests/test-init.sh,
+	lib/gltests/test-inttypes.c, lib/gltests/test-stdint.c,
+	lib/gltests/unistd.in.h: Update gnulib files.
+
+2011-12-27  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, THANKS: Give credit.
+
+2011-12-27  Simon Josefsson <simon@josefsson.org>
+
+	* lib/Makefile.am: Fix parallel MinGW-builds (no deps for
+	libidn-X.def).  Clean libidn-X.def.  Reported by RenÃ© Berber <r.berber@computer.org>.
+
+2011-11-30  Simon Josefsson <simon@josefsson.org>
+
+	* gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4,
+	gl/m4/manywarnings.m4, gltests/Makefile.am,
+	gltests/test-binary-io.c, gltests/test-binary-io.sh, maint.mk: 
+	Update gnulib files.
+
+2011-11-28  Simon Josefsson <simon@josefsson.org>
+
+	* NEWS, configure.ac, lib/stringprep.h: Bump versions.
+
+2011-11-28  Simon Josefsson <simon@josefsson.org>
+
+	* gl/Makefile.am, gl/m4/dup2.m4, gl/m4/getcwd.m4, gl/m4/getopt.m4,
+	gl/m4/gnulib-comp.m4, gl/m4/unistd_h.m4, lib/gl/Makefile.am,
+	lib/gl/c-ctype.h, lib/gl/c-strcase.h, lib/gl/gnulib.mk,
+	lib/gl/m4/gnulib-cache.m4, lib/gl/m4/unistd_h.m4,
+	lib/gltests/Makefile.am, lib/gltests/gnulib.mk: Update gnulib files.
+	Drop unistd/getopt workaround.
+
+2011-11-25  Simon Josefsson <simon@josefsson.org>
+
+	* ChangeLog: Generated.
+
 2011-11-25  Simon Josefsson <simon@josefsson.org>
 
 	* cfg.mk: Fix release rule.
diff --git a/NEWS b/NEWS
index 1b4db5d..64ce847 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@ Libidn NEWS -- History of user-visible changes.                 -*- outline -*-
 Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
-* Version 1.24 (unreleased) [?]
+* Version 1.24 (released 2012-01-10) [stable]
 
 ** Libraries are re-licensed from LGPLv2+ to dual-GPLv2+|LGPLv3+.
 


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Tue Jan 10 15:33:39 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RkiO3-0000M7-J9
	for mharc-libidn-commit@gnu.org; Tue, 10 Jan 2012 15:33:39 -0500
Received: from eggs.gnu.org ([140.186.70.92]:47646)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkiO0-0000L9-D0
	for libidn-commit@gnu.org; Tue, 10 Jan 2012 15:33:37 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkiNu-0003eI-NW
	for libidn-commit@gnu.org; Tue, 10 Jan 2012 15:33:36 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:32808)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkiNu-0003eD-Ej
	for libidn-commit@gnu.org; Tue, 10 Jan 2012 15:33:30 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RkiNt-0008U8-Tf
	for libidn-commit@gnu.org; Tue, 10 Jan 2012 20:33:30 +0000
Date: Tue, 10 Jan 2012 20:33:29 +0000
Message-Id: <E1RkiNt-0008U8-Tf@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn annotated tag, libidn-1-24, created. libidn-1-24
X-Git-Refname: refs/tags/libidn-1-24
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 9b5dd4dd878d9eead27270c64ca85f68a6bdb764
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2012 20:33:37 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=9b5dd4dd878d9eead27270c64ca85f68a6bdb764

The annotated tag, libidn-1-24 has been created
        at  9b5dd4dd878d9eead27270c64ca85f68a6bdb764 (tag)
   tagging  f1ede53707d894ab67c9eef4e84017342466c148 (commit)
  replaces  libidn-1-23
 tagged by  Simon Josefsson
        on  Tue Jan 10 21:33:17 2012 +0100

- Log -----------------------------------------------------------------
1.24
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iO4EAAECADgFAk8MoI0xFIAAAAAAFQATcGthLWFkZHJlc3NAZ251cGcub3Jnc2lt
b25Aam9zZWZzc29uLm9yZwAKCRDtoh6UtWVxb8/SBP4g6bAasURoqlEQXPxq2ja7
LzmF3QVG7F+8aCX4YcsADlB6Q4eLbPMQi2cFYcbGtyvQhjcnHB6CWdrRtAyBVwro
X3jDA8Fb6de1Ne2AMIiHXt2OpKu5TxmfbjwOLYOWz9fef1KqwzuhqXGNyMI8mM/e
neFqXTsK7kEz2ldXgM2KcbYNWcH51LM0ZqtnCzMpB7YdSIs7kJrdCk98t7FRYr19
=HeI1
-----END PGP SIGNATURE-----

Simon Josefsson (32):
      Update gnulib files.  Drop unistd/getopt workaround.
      Bump versions.
      Update gnulib files.
      Fix parallel MinGW-builds (no deps for libidn-X.def).  Clean libidn-X.def.
      Give credit.
      Update gnulib files.
      Sync with TP.
      Sync glib NFKC code and improve copyright/license statements.
      Update key.
      Mention gnulib in THANKS.
      Update copyright years.
      Update FSF copyright years.
      Remove stale translation.
      Update gnulib files.
      Print whether libiconv was found.
      Rename README-alpha to HACKING and include it in tarballs.
      Update gnulib files.
      Put strlen calls in its own line, to simplify valgrind output analysis.
      Relicense libraries from LGPLv2+ to dual-GPLv2+|LGPLv3+.
      Update gnulib files.
      Cleanup copyright info.
      Fix.
      libidn: Fix potential infloop in pr29 code.
      Fix typo.
      libidn: Add 'const' keyword to 'stringprep_ucs4_nfkc_normalize' function.
      tst_pr29: Print more debug info.
      Update gnulib files.
      Also dist COPYING* files.
      Sync intro texts.
      Fix markup.
      Version 1.24.
      Generated.

-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU libidn


From MAILER-DAEMON Mon Jan 16 15:29:27 2012
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1RmtBH-00088B-P0
	for mharc-libidn-commit@gnu.org; Mon, 16 Jan 2012 15:29:27 -0500
Received: from eggs.gnu.org ([140.186.70.92]:60798)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RmtBF-00087Y-1V
	for libidn-commit@gnu.org; Mon, 16 Jan 2012 15:29:27 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RmtB9-0001Eb-KN
	for libidn-commit@gnu.org; Mon, 16 Jan 2012 15:29:25 -0500
Received: from vcs.savannah.gnu.org ([140.186.70.72]:57642)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RmtB9-0001ER-IO
	for libidn-commit@gnu.org; Mon, 16 Jan 2012 15:29:19 -0500
Received: from jas by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1RmtB9-0003jW-JD
	for libidn-commit@gnu.org; Mon, 16 Jan 2012 20:29:19 +0000
Date: Mon, 16 Jan 2012 20:29:19 +0000
Message-Id: <E1RmtB9-0003jW-JD@vcs.savannah.gnu.org>
From: "Simon Josefsson" <simon@josefsson.org>
To: libidn-commit@gnu.org
Subject: [SCM] GNU libidn branch, master, updated. libidn-1-24-4-g50ca880
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f1ede53707d894ab67c9eef4e84017342466c148
X-Git-Newrev: 50ca880ad0fc60466701991673b5e9cc6bcc2c10
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: libidn-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Commit messages for GNU Libidn <libidn-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/libidn-commit>
List-Post: <mailto:libidn-commit@gnu.org>
List-Help: <mailto:libidn-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/libidn-commit>,
	<mailto:libidn-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jan 2012 20:29:27 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU libidn".

http://git.savannah.gnu.org/cgit/libidn.git/commit/?id=50ca880ad0fc60466701991673b5e9cc6bcc2c10

The branch, master has been updated
       via  50ca880ad0fc60466701991673b5e9cc6bcc2c10 (commit)
       via  e3aeedd2cf1ebf4025d405f9c1064866ecc93f9b (commit)
       via  dc12e3042cf14c85573b62ac2c806f449f7e5630 (commit)
       via  01e993dde1df77b8ced17c6cbf2fc6c2da5914d5 (commit)
      from  f1ede53707d894ab67c9eef4e84017342466c148 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 50ca880ad0fc60466701991673b5e9cc6bcc2c10
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jan 10 21:50:05 2012 +0100

    Drop files.

commit e3aeedd2cf1ebf4025d405f9c1064866ecc93f9b
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jan 10 21:49:20 2012 +0100

    Bump versions.

commit dc12e3042cf14c85573b62ac2c806f449f7e5630
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jan 10 21:43:24 2012 +0100

    Update for 1.24.

commit 01e993dde1df77b8ced17c6cbf2fc6c2da5914d5
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jan 10 21:36:06 2012 +0100

    Update for 1.23.

-----------------------------------------------------------------------

Summary of changes:
 NEWS             |    4 ++
 cfg.mk           |    2 +-
 configure.ac     |    6 +-
 doc/announce.txt |  116 +++++++++++++++++++++++++++++------------------------
 lib/stringprep.h |    2 +-
 5 files changed, 72 insertions(+), 58 deletions(-)

diff --git a/NEWS b/NEWS
index 64ce847..b357715 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ Libidn NEWS -- History of user-visible changes.                 -*- outline -*-
 Copyright (C) 2002-2012 Simon Josefsson
 See the end for copying conditions.
 
+* Version 1.25 (unreleased) [?]
+
+** API and ABI is backwards compatible with the previous version.
+
 * Version 1.24 (released 2012-01-10) [stable]
 
 ** Libraries are re-licensed from LGPLv2+ to dual-GPLv2+|LGPLv3+.
diff --git a/cfg.mk b/cfg.mk
index 87e94f6..2931d20 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -29,7 +29,7 @@ local-checks-to-skip = sc_prohibit_strcmp sc_prohibit_have_config_h	\
 	sc_prohibit_HAVE_MBRTOWC sc_program_name sc_trailing_blank	\
 	sc_GPL_version sc_immutable_NEWS
 VC_LIST_ALWAYS_EXCLUDE_REGEX = \
-	^(GNUmakefile|maint.mk|gtk-doc.make|m4/pkg.m4|doc/specifications|contrib/doxygen/Doxyfile|doc/gpl-3.0.texi|doc/lgpl-2.1.texi|doc/fdl-1.3.texi|csharp/libidn.*suo|(lib/)?(gl|gltests|build-aux)/)
+	^(GNUmakefile|maint.mk|gtk-doc.make|m4/pkg.m4|doc/specifications|contrib/doxygen/Doxyfile|doc/fdl-1.3.texi|csharp/libidn.*suo|(lib/)?(gl|gltests|build-aux)/)
 update-copyright-env = UPDATE_COPYRIGHT_HOLDER="Simon Josefsson" UPDATE_COPYRIGHT_USE_INTERVALS=1
 
 # Explicit syntax-check exceptions.
diff --git a/configure.ac b/configure.ac
index dc340da..4725137 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,8 +18,8 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GNU Libidn], [1.24], [bug-libidn@gnu.org])
-AC_COPYRIGHT([Copyright (c) 2002-2011 Simon Josefsson <simon@josefsson.org>.])
+AC_INIT([GNU Libidn], [1.25], [bug-libidn@gnu.org])
+AC_COPYRIGHT([Copyright (c) 2002-2012 Simon Josefsson <simon@josefsson.org>.])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS(config.h)
@@ -31,7 +31,7 @@ AM_SILENT_RULES([yes])
 # Interfaces added:                             AGE++
 # Interfaces removed:                           AGE=0
 AC_SUBST(LT_CURRENT, 17)
-AC_SUBST(LT_REVISION, 7)
+AC_SUBST(LT_REVISION, 8)
 AC_SUBST(LT_AGE, 6)
 
 AC_PROG_CC
diff --git a/doc/announce.txt b/doc/announce.txt
index eff9117..ead947a 100644
--- a/doc/announce.txt
+++ b/doc/announce.txt
@@ -1,36 +1,53 @@
 To: help-libidn@gnu.org, info-gnu@gnu.org
-Subject: Libidn 1.22 released
+Subject: Libidn 1.24 released
 <#part sign=pgpmime>
 GNU Libidn is a fully documented implementation of the Stringprep,
 Punycode and IDNA specifications.  Libidn's purpose is to encode and
-decode internationalized domain names.  The native C, C# and Java
-libraries are available under the GNU Lesser General Public License
-version 2.1 or later.
+decode internationalized domain name strings.  There are native C, C#
+and Java libraries.
 
 Noteworthy changes since the last release (from NEWS file):
 
-* Version 1.22 (released 2011-05-04) [stable]
+* Version 1.24 (released 2012-01-10) [stable]
 
-** libidn: Add -liconv as static library requirement in libidn.pc, for MinGW.
-Reported by Volker Grabsch <vog@notjusthosting.com>.
+** Libraries are re-licensed from LGPLv2+ to dual-GPLv2+|LGPLv3+.
 
-** libidn: Fix memory leak in idna_to_ascii_4z when idna_to_ascii_4i fails.
-Reported by and tiny patch from Olga Limburg <olimburg@gmail.com>.
+** build: Fix parallel Windows builds.
+Reported by RenÃ© Berber <r.berber@computer.org>.
 
-** libidn: Ran clang-analyze on the code.
-Fixed some dead assignments/initializations.
+** libidn: Fix potential infloop in pr29 code.
+Reported by Jon Nelson <jnelson@jamponi.net> in
+<http://lists.gnu.org/archive/html/help-libidn/2012-01/msg00008.html>.
 
-** build: Really distribute win32/libidn4win.mk.
+** libidn: Add 'const' keyword to 'stringprep_ucs4_nfkc_normalize' function.
+
+** Sync glib NFKC code and improve copyright/license statements.
+
+** Update gnulib files and translations.
 
 ** API and ABI is backwards compatible with the previous version.
 
-The library contains a generic Stringprep implementation.  Profiles
+The C library contains a generic Stringprep implementation.  Profiles
 for Nameprep, iSCSI, SASL, XMPP and Kerberos V5 are included.
 Punycode and ASCII Compatible Encoding (ACE) via IDNA are supported.
 A mechanism to define Top-Level Domain (TLD) specific validation
 tables, and to compare strings against those tables, is included.
 Default tables for some TLDs are also included.
 
+The Stringprep API consists of two main functions, one for converting
+data from the system's native representation into UTF-8, and one
+function to perform the Stringprep processing.  Adding a new
+Stringprep profile for your application within the API is
+straightforward.  The Punycode API consists of one encoding function
+and one decoding function.  The IDNA API consists of the ToASCII and
+ToUnicode functions, as well as an high-level interface for converting
+entire domain names to and from the ACE encoded form.  The TLD API
+consists of one set of functions to extract the TLD name from a domain
+string, one set of functions to locate the proper TLD table to use
+based on the TLD name, and core functions to validate a string against
+a TLD table, and some utility wrappers to perform all the steps in one
+call.
+
 Libidn is developed for the GNU/Linux system, but runs on over 20 Unix
 platforms (including Solaris, IRIX, AIX, and Tru64) and Windows.  The
 library is written in C and (parts of) the API is also accessible from
@@ -38,8 +55,7 @@ C++, Emacs Lisp, Python and Java.  A native Java and C# port is
 included.
 
 Also included is a command line tool, several self tests, code
-examples, and more, all licensed under the GNU General Public License
-version 3.0 or later.
+examples, and more.
 
 Improving Libidn is costly, but you can help!  We are looking for
 organizations that find Libidn useful and wish to contribute back.
@@ -53,83 +69,77 @@ maintenance.  We are always looking for interesting development
 projects.  See http://josefsson.org/ for more details.
 
 The project page of the library is available at:
-  http://www.gnu.org/software/libidn/
+  https://www.gnu.org/software/libidn/
 
 All manual formats are available from:
-  http://www.gnu.org/software/libidn/manual/
+  https://www.gnu.org/software/libidn/manual/
 
 Specifically, the following formats are available.
 
 The main manual:
-  http://www.gnu.org/software/libidn/manual/libidn.html - HTML format
-  http://www.gnu.org/software/libidn/manual/libidn.pdf - PDF format
+  https://www.gnu.org/software/libidn/manual/libidn.html - HTML format
+  https://www.gnu.org/software/libidn/manual/libidn.pdf - PDF format
 
 API Reference manual:
-  http://www.gnu.org/software/libidn/reference/ch01.html - GTK-DOC HTML
-  http://www.gnu.org/software/libidn/reference/libidn.pdf - GTK-DOC PDF
+  https://www.gnu.org/software/libidn/reference/intro.html - GTK-DOC HTML
+  https://www.gnu.org/software/libidn/reference/libidn.pdf - GTK-DOC PDF
 
 Doxygen documentation:
-  http://www.gnu.org/software/libidn/doxygen/index.html - HTML format
-  http://www.gnu.org/software/libidn/doxygen/libidn.pdf - PDF format
+  https://www.gnu.org/software/libidn/doxygen/index.html - HTML format
+  https://www.gnu.org/software/libidn/doxygen/libidn.pdf - PDF format
 
 JavaDoc output for the Java API:
-  http://www.gnu.org/software/libidn/javadoc/
+  https://www.gnu.org/software/libidn/javadoc/
 
 If you need help to use Libidn, or want to help others, you are
 invited to join our help-libidn mailing list, see:
-  http://lists.gnu.org/mailman/listinfo/help-libidn
+  https://lists.gnu.org/mailman/listinfo/help-libidn
 
-Here are the compressed sources (3.3MB):
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22.tar.gz
-  http://ftp.gnu.org/gnu/libidn/libidn-1.22.tar.gz
+Here are the compressed sources (3.2MB):
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24.tar.gz
+  http://ftp.gnu.org/gnu/libidn/libidn-1.24.tar.gz
 
 Here are GPG detached signatures:
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22.tar.gz.sig
-  http://ftp.gnu.org/gnu/libidn/libidn-1.22.tar.gz.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24.tar.gz.sig
+  http://ftp.gnu.org/gnu/libidn/libidn-1.24.tar.gz.sig
 
 Here are the SHA-1 and SHA-224 signatures:
 
-8358e897c24d534438f6b5694c25e85889d860c3  libidn-1.22.tar.gz
-72a452464252655803331e744c7ea3b5a06f88cc33b2c310377fe040  libidn-1.22.tar.gz
+4251c108966375ede4df15d76a1bd9a4440f44ee  libidn-1.24.tar.gz
+71599952df85af90915310a6a7660edac062965e83c01fe3ca0cfa4e  libidn-1.24.tar.gz
 
 We also provide Windows binaries built using MinGW-w64 with the build
 script win32/libidn4win.mk, for 32-bit and 64-bit x86 architecures:
 
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22-win32.zip
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22-win32.zip.sig
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22-win64.zip
-  ftp://ftp.gnu.org/gnu/libidn/libidn-1.22-win64.zip.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24-win32.zip
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24-win32.zip.sig
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24-win64.zip
+  ftp://ftp.gnu.org/gnu/libidn/libidn-1.24-win64.zip.sig
 
 Here are the SHA-1 and SHA-224 signatures:
 
-eccd416edb3ce60573da5c8264df77b780d00a80  libidn-1.22-win32.zip
-57d64a348a2b3a8782e729ecad1f8e10d1b721ec1196e1ca0a8ca5d3  libidn-1.22-win32.zip
+994ffd7059ecc6a758fa9fc1b5735279d29bcca1  libidn-1.24-win32.zip
+a276074ae3c9b234375b94a8b639a0c45020cc01bfa98079a74c1cf0  libidn-1.24-win32.zip
 
-b7b138a1c146e64aa6d6047786766a849237732d  libidn-1.22-win64.zip
-ddaa613848bbdc37199dfa3c9b4c04f77db8d506427213f55cee4934  libidn-1.22-win64.zip
+d22700214317f3ee9be7cec4a3fe6c31c135d3fa  libidn-1.24-win64.zip
+c144d02490709aaba114226bd120d33f97dd7eac21c38aef5c3f8e7e  libidn-1.24-win64.zip
 
-The software is cryptographically signed by the author using an
-OpenPGP key identified by the following information:
+The software is cryptographically signed by the author using an OpenPGP
+key identified by the following information:
 
-pub   1280R/B565716F 2002-05-05 [expires: 2012-01-24]
+pub   1280R/B565716F 2002-05-05 [expires: 2013-05-10]
       Key fingerprint = 0424 D4EE 81A0 E3D1 19C6  F835 EDA2 1E94 B565 716F
 uid                  Simon Josefsson <simon@josefsson.org>
-sub   1280R/4D5D40AE 2002-05-05 [expires: 2012-01-24]
+sub   1280R/4D5D40AE 2002-05-05 [expires: 2013-05-10]
 
 The key is available from:
   http://josefsson.org/key.txt
   dns:b565716f.josefsson.org?TYPE=CERT
 
-Here are the build reports for various platforms:
-  http://autobuild.josefsson.org/libidn/
-
-Daily builds of the package are available from:
-  http://daily.josefsson.org/libidn/
-
 Code coverage, clang-analyzer output, and cyclomatic code complexity charts:
-  http://www.gnu.org/software/libidn/coverage/
-  http://www.gnu.org/software/libidn/clang-analyzer/
-  http://www.gnu.org/software/libidn/cyclo/cyclo-libidn.html
+  https://www.gnu.org/software/libidn/coverage/
+  https://www.gnu.org/software/libidn/clang-analyzer/
+  https://www.gnu.org/software/libidn/cyclo/
 
 Happy hacking,
 Simon
diff --git a/lib/stringprep.h b/lib/stringprep.h
index 80ae2ed..1ff4db0 100644
--- a/lib/stringprep.h
+++ b/lib/stringprep.h
@@ -51,7 +51,7 @@ extern "C"
 {
 # endif
 
-# define STRINGPREP_VERSION "1.24"
+# define STRINGPREP_VERSION "1.25"
 
 /* Error codes. */
   typedef enum


hooks/post-receive
-- 
GNU libidn


