Imported Upstream version 1.4.13+git200906171200

2013-11-26 23:56:50 +01:00 · 2013-11-26 23:56:50 +01:00 · d0b8ab8112
parent 4ab9f0d24c
commit d0b8ab8112
362 changed files with 34110 additions and 10773 deletions
--- a/10
+++ b/10
@ -2,20 +2,22 @@ This file lists the major bugs from the Nagios Plugins page on Sourceforge
 at http://sourceforge.net/tracker/?group_id=29880&atid=397597. These are not
 necessarily verified as errors.
-For the 1.4.11 release:
+For the 1.4.13 release:
 2075933 - check_disk segfault on freebsd 7 if using -p option
 1985263 - check_ups doesn't disconnect cleanly
 1984255 - check_swap not built on Solaris 10 and HP-UX 11.11, 11.23
 1984240 - check_tcp Segmentation fault on HP-UX 11.23
 1939578 - check_jabber: Always returns WARNING with Openfire server
 1939529 - check_tcp: Expiring SSL certs produce confusing messages
-1928399 - check_porcs METRIC_CPU should ignore kernel processes on FreeBSD
+1928399 - check_procs METRIC_CPU should ignore kernel processes on FreeBSD
 1922579 - check_ldap: ldap_init implicitly converted
 1904965 - check_apt: SECURITY_RE is not correct
 1894850 - check_ping: incorrectly parses ping6 output
 1868822 - check_http link fails with openssl installed
 1867716 - check_snmp invalid performance data
 1864404 - check_smtp/check_http miscalculate timezones in cert expiry
 1681516 - output too verbose for various checks
 1670261 - check_snmp might require snmpget with LD_LIBRARY_PATH
 1569488 - check_ifoperstatus.pl: -n option does't work (help required!)
 1523748 - check_disk should error if warn range is subset of critical
 1478287 - check_dns fails with CNAMEs
 1469468 - signal handler in popen.c is broken
--- a/414
+++ b/414
@ -1,3 +1,312 @@
 2008-09-25 08:04  tonvoon
 	* [r2056] plugins/tests/check_http.t:
 	  Fix small test failure
 2008-09-25 08:01  tonvoon
 	* [r2055] doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING:
 	  Moving project administration documents to nagiosplugins.org site
 2008-09-02 12:28  dermoth
 	* [r2054] plugins/check_ntp_peer.c:
 	  Typo
 2008-09-02 11:26  hweiss
 	* [r2053] THANKS.in, plugins/check_http.c:
 	  Some HTTP server applications/configurations cause trouble if the
 	  port is explicitly specified in our "Host:" header line.
 	  Therefore, we now specify the port only if we're using a
 	  non-default port (Erik Wasser - 2082501).
 2008-09-02 03:42  dermoth
 	* [r2052] NEWS, plugins/check_ntp_peer.c:
 	  Fix possible segfault in check_ntp_peer with deliberately invalid
 	  packets
 2008-09-01 14:04  dermoth
 	* [r2051] NEWS, plugins/check_ntp_peer.c, plugins/check_ntp_time.c:
 	  check_ntp_peer/check_ntp_time used to show port in --help but
 	  ignored the argument - now implemented.
 2008-09-01 14:04  dermoth
 	* [r2050] NEWS, THANKS.in, plugins/check_http.c:
 	  Revert "Re-structure the HTTP 1.1 headers to prevent 301s on
 	  servers with virtual hosts"
 	  This reverts commit 2030
 2008-09-01 12:20  hweiss
 	* [r2049] plugins/check_http.c:
 	  Under some circumstances, the 'url' path of a redirection target
 	  missed a leading slash. While this was fixed later on, the
 	  incomplete 'url' was used for redirection loop detection and
 	  error messages. This is now fixed by adding the missing slash
 	  immediately.
 2008-08-25 18:39  tonvoon
 	* [r2048] plugins/tests/check_http.t:
 	  Fix HTTP::Daemon::VERSION to get a fixed header size for tests
 	  (Sven Nierlein)
 2008-08-25 13:26  tonvoon
 	* [r2047] plugins/tests/check_http.t:
 	  Updated with more tests re: multiple status codes (Sven Nierlein)
 2008-08-25 11:42  hweiss
 	* [r2046] NEWS, THANKS.in, plugins/check_http.c,
 	  plugins/tests/check_http.t:
 	  The "-e" option now accepts a comma-delimited list of expected
 	  status lines (Sven Nierlein - 1894496).
 2008-08-22 13:08  tonvoon
 	* [r2045] plugins/tests/check_http.t, plugins/tests/var/root:
 	  Added HTTP tests for status codes
 2008-08-21 21:52  tonvoon
 	* [r2044] configure.in:
 	  Only include extra-opts tests if libtap is enabled
 2008-08-21 15:21  tonvoon
 	* [r2043] NEWS:
 	  Note re: --enable-libtap
 2008-08-21 15:18  tonvoon
 	* [r2042] lib/tests/Makefile.am, lib/tests/test_all.t,
 	  lib/tests/test_base64.t, lib/tests/test_cmd.t,
 	  lib/tests/test_disk.t, lib/tests/test_ini.t,
 	  lib/tests/test_opts.t, lib/tests/test_tcp.t,
 	  lib/tests/test_utils.c, lib/tests/test_utils.t:
 	  Correctly link to included libtap. Simplify invoking test
 	  scripts. Removed basename test as we should use base_name from
 	  GNUlib which is tested separately
 2008-08-21 15:15  tonvoon
 	* [r2041] tools/tinderbox_build:
 	  Fix regexp of version number of snapshot
 2008-08-21 15:12  tonvoon
 	* [r2040] Makefile.am:
 	  Remove .svn files in distribution
 2008-08-21 15:12  tonvoon
 	* [r2039] external/tap-1.01-altinity.tar.gz,
 	  external/tap-1.01-nagios-plugins.tar.gz, tools/setup:
 	  Renamed altered tap file to nagios-plugins
 2008-08-21 09:41  dermoth
 	* [r2038] plugins/check_ntp_peer.c:
 	  Nothing
 2008-08-21 04:22  dermoth
 	* [r2037] plugins/check_ntp_peer.c:
 	  Misplaced comment
 2008-08-21 04:17  dermoth
 	* [r2036] plugins/check_ntp_peer.c:
 	  Complete rewrite of the extract_value function
 	  The original one was flawed (easy to trigger segfaults) and did
 	  not allow some whitespaces as permitted by rfc1305. This one has
 	  been troughfully tested with tap (the testing code might get
 	  included later)
 2008-08-21 04:17  dermoth
 	* [r2035] lib/parse_ini.c, lib/parse_ini.h, lib/tests/test_opts.c:
 	  Typos in comments
 2008-08-16 04:47  dermoth
 	* [r2034] plugins/check_mysql.c, plugins/check_mysql_query.c:
 	  Fix assignment written as a comparison in validate_arguments()
 	  when db_pass is NULL (Patch from
 	  http://blog.barfoo.org/projects/rpms-for-sles10)
 2008-08-16 04:47  dermoth
 	* [r2033] plugins/check_fping.c:
 	  Fix check_fping --help output (Patch from
 	  http://blog.barfoo.org/projects/rpms-for-sles10)
 2008-08-16 01:52  dermoth
 	* [r2032] plugins/t/check_by_ssh.t:
 	  Typo
 2008-08-08 16:12  tonvoon
 	* [r2031] plugins-root/pst3.c:
 	  Close on fd
 2008-08-08 02:25  dermoth
 	* [r2030] NEWS, THANKS.in, plugins/check_http.c:
 	  Re-structure the HTTP 1.1 headers to prevent 301s on servers with
 	  virtual hosts
 2008-08-08 02:08  dermoth
 	* [r2029] plugins-root/check_icmp.c:
 	  Typo in --help output
 2008-08-05 11:14  dermoth
 	* [r2028] tools/devmode:
 	  Set -D_FORTIFY_SOURCE=2, and added a comment with link to
 	  explaination of this flag.
 2008-07-28 20:15  psychotrahe
 	* [r2027] plugins-root/check_icmp.c:
 	  -b option now specifies ICMP data bytes instead of packet size
 2008-07-17 07:06  psychotrahe
 	* [r2026] NEWS, plugins-root/check_icmp.c:
 	  Add support for packet size modification (-b)
 2008-07-10 10:03  dermoth
 	* [r2025] plugins/check_disk.c:
 	  Verbose should not have to exceed 3 as per developement
 	  guidelines
 2008-07-10 10:03  dermoth
 	* [r2024] tools/devmode:
 	  Add -D_FORTIFY_SOURCE
 2008-07-10 10:03  dermoth
 	* [r2023] plugins/check_ups.c:
 	  Typo in check_ups
 2008-07-09 21:54  psychotrahe
 	* [r2022] plugins/t/check_snmp.t:
 	  rewrote check_snmp.t to use Test::More added perfdata checking
 	  for string values
 2008-07-09 21:53  psychotrahe
 	* [r2021] NEWS, plugins/check_snmp.c:
 	  check_snmp now only prints perfdata for non numeric values (Joerg
 	  Linge #1867716)
 2008-07-08 10:09  tonvoon
 	* [r2020] Makefile.am, tools/tinderbox_build:
 	  Removed libtap configuration for the moment, as tinderbox builds
 	  are breaking
 2008-07-08 09:31  tonvoon
 	* [r2019] NEWS, lib/utils_cmd.c, lib/utils_cmd.h,
 	  plugins/Makefile.am, plugins/check_procs.c:
 	  check_procs captures stderr and adds to plugin output. This is
 	  from a merge of branch nagiosplug/branches/new_threshold_syntax
 	  1979:1982
 2008-07-06 12:57  hweiss
 	* [r2018] plugins-root/check_dhcp.c:
 	  Don't try to set the "SO_BROADCAST" socket option for unicast
 	  requests. (Also, removed the unused "DHCP_UNICAST_FLAG" macro.)
 2008-07-02 20:07  tonvoon
 	* [r2017] lib/tests/Makefile.am:
 	  Use tap.h from the libtap directory
 2008-07-02 20:00  tonvoon
 	* [r2016] plugins-root/Makefile.am, plugins-root/pst3.c:
 	  Change pst3 again, this time to remove use of kvm which is not
 	  available in Solaris 10 non-global zones. Uses /proc, which is
 	  not available in older versions of Solaris.
 2008-06-30 14:32  tonvoon
 	* [r2015] tools/setup:
 	  Fixed bug in tools/setup if docbook was run
 2008-06-30 09:01  tonvoon
 	* [r2014] Makefile.am:
 	  Have to list tap_dir manually to get into make dist
 2008-06-26 22:00  tonvoon
 	* [r2013] Makefile.am, configure.in, external, external/README,
 	  external/tap-1.01-altinity.tar.gz, lib/tests/Makefile.am,
 	  tools/setup, tools/tinderbox_build:
 	  Adding libtap into distribution to help run C based tests
 2008-06-17 14:19  tonvoon
 	* [r2012] plugins-root/pst3.c:
 	  Fixed possible coredump. Removed one level of subroutines (Duncan
 	  Ferguson)
 2008-06-09 19:47  psychotrahe
 	* [r2011] NEWS, plugins/check_dig.c, plugins/t/check_dig.t:
 	  Added testcases for check_dig check_dig's -l option is mandatory
 	  now (#1986306)
 2008-06-02 16:22  tonvoon
 	* [r2010] NEWS, plugins-root/pst3.c:
 	  Optimised pst3 for systems with large number of processes (Duncan
 	  Ferguson)
 2008-06-02 16:21  tonvoon
 	* [r2009] NEWS, perlmods/Nagios-Plugin-0.22.tar.gz,
 	  perlmods/Nagios-Plugin-0.27.tar.gz:
 	  Updated Nagios::Plugin perl modules to 0.27
 2008-05-30 23:38  dermoth
 	* [r2008] NEWS, THANKS.in, plugins/check_http.c:
 	  Fix Debian bug #460097: check_http --max-age broken (Hilko
 	  Bengen)
 2008-05-29 10:21  dermoth
 	* [r2007] BUGS:
 	  typo
 2008-05-27 23:44  tonvoon
 	* [r2006] doc/RELEASING:
 	  Changed SF file release to use sftp instead of ftp
 2008-05-27 22:01  tonvoon
 	* [r2004] BUGS, ChangeLog, NEWS, configure.in, package.def:
 	  Preparation for 1.4.12 release
 2008-05-27 21:52  tonvoon
 	* [r2003] THANKS.in, configure.in:
@ -1395,7 +1704,7 @@
 2007-07-07 11:54  psychotrahe
 	* [r1750] plugins-scripts/check_file_age.pl:
-	  substituted $ID$ through $Revision: 2004 $ in print_revision call
+	  substituted $ID$ through $Revision: 2057 $ in print_revision call
 2007-07-07 11:40  psychotrahe
@ -4762,8 +5071,7 @@
 2005-04-04 18:24  tonvoon
-	* [r1155] nagiosplug/branches/r1_4-patches/plugins/check_smtp.c,
+	* [r1155] plugins/check_smtp.c:
 	  plugins/check_smtp.c:
 	  Fix static buffer (Nikolay Sturm)
 2005-03-18 03:14  mattkent
@ -6506,8 +6814,7 @@
 2004-03-18 20:40  tonvoon
-	* [r852] nagiosplug/branches/release-1.3.0/configure.in,
+	* [r852] configure.in:
 	  configure.in:
 	  Mysql include path not added correctly (Arnold Cavazos - 912974)
 2004-03-18 20:31  tonvoon
@ -6689,14 +6996,8 @@
 2004-02-20 05:25  kdebisschop
-	* [r818] nagiosplug/branches/release-1.3.0/contrib/check_dhcp.c,
+	* [r818] contrib/check_dhcp.c, plugins/check_snmp.c,
-	  nagiosplug/branches/release-1.3.0/contrib/check_procl.sh,
+	  plugins/negate.c, plugins/netutils.c, plugins/urlize.c:
 	  nagiosplug/branches/release-1.3.0/plugins/check_snmp.c,
 	  nagiosplug/branches/release-1.3.0/plugins/negate.c,
 	  nagiosplug/branches/release-1.3.0/plugins/netutils.c,
 	  nagiosplug/branches/release-1.3.0/plugins/urlize.c,
 	  contrib/check_dhcp.c, plugins/check_snmp.c, plugins/negate.c,
 	  plugins/netutils.c, plugins/urlize.c:
 	  spell fix "received"
 2004-02-20 05:21  kdebisschop
@ -6807,14 +7108,13 @@
 2004-01-21 12:50  kdebisschop
-	* [r797] nagiosplug/branches/release-1.3.0/AUTHORS, AUTHORS:
+	* [r797] AUTHORS:
 	  credit David Croft (patch check_tcp formultibyte malloc bug in
 	  server_expect)
 2004-01-21 12:49  kdebisschop
-	* [r796] nagiosplug/branches/release-1.3.0/plugins/check_tcp.c,
+	* [r796] plugins/check_tcp.c:
 	  plugins/check_tcp.c:
 	  =fix segfault on malloc of server_expect for multibyte chars
 	  (David Croft)
@ -7384,8 +7684,7 @@
 2003-08-22 04:43  kdebisschop
-	* [r689] nagiosplug/branches/release-1.3.0/plugins/check_http.c,
+	* [r689] plugins/check_http.c:
 	  plugins/check_http.c:
 	  * bugfix: snprintf of timestamp truncated '\0'
 2003-08-21 18:00  kdebisschop
@ -7765,8 +8064,7 @@
 2003-08-01 02:12  kdebisschop
-	* [r624] nagiosplug/branches/release-1.3.0/plugins/Makefile.am,
+	* [r624] plugins/Makefile.am:
 	  plugins/Makefile.am:
 	  'ln -f -s ...' is not reliable/portable. Use 'rm -f ...; ln -s
 	  ...'
@ -7831,14 +8129,12 @@
 2003-07-29 03:06  kdebisschop
-	* [r613] nagiosplug/branches/release-1.3.0/configure.in,
+	* [r613] configure.in:
 	  configure.in:
 	  look for getloadavg.c in $topdir/lib, not $srcdir/lib
 2003-07-29 03:05  kdebisschop
-	* [r612] nagiosplug/branches/release-1.3.0/plugins/check_http.c,
+	* [r612] plugins/check_http.c:
 	  plugins/check_http.c:
 	  patch attempt to reference undefined optarg (credit Paul Farrall)
 2003-07-28 11:36  tonvoon
@ -7974,9 +8270,7 @@
 2003-07-02 16:21  tonvoon
-	* [r581]
+	* [r581] plugins-scripts/check_oracle.sh:
 	  nagiosplug/branches/release-1.3.0/plugins-scripts/check_oracle.sh,
 	  plugins-scripts/check_oracle.sh:
 	  Check for ORA- errors for tablespace and cache (patch 755456 -
 	  Sven Meyer)
@ -8145,14 +8439,12 @@
 2003-06-12 04:46  undrgrid
-	* [r548] nagiosplug/branches/release-1.3.0/command.cfg.in,
+	* [r548] command.cfg.in:
 	  command.cfg.in:
 	  Renamed duplicate check_snmp command definitions to be unique
 2003-06-12 04:16  undrgrid
-	* [r547] nagiosplug/branches/release-1.3.0/command.cfg.in,
+	* [r547] command.cfg.in, configure.in:
 	  command.cfg.in, configure.in:
 	  Made the two check_ifoperstatus commands unique to remove
 	  conflicts
@ -8202,8 +8494,7 @@
 2003-06-02 14:46  kdebisschop
-	* [r531] nagiosplug/branches/release-1.3.0/plugins/check_tcp.c,
+	* [r531] plugins/check_tcp.c:
 	  plugins/check_tcp.c:
 	  finish recv() loop when stream GT or EQ maxbytes (was GT)
 2003-06-01 05:38  kdebisschop
@ -8231,26 +8522,22 @@
 2003-05-17 23:10  tonvoon
-	* [r521] nagiosplug/branches/release-1.3.0/plugins/t/check_ftp.t,
+	* [r521] plugins/t/check_ftp.t:
 	  plugins/t/check_ftp.t:
 	  Fixed test (Mathew Ericson - 738609)
 2003-05-17 17:59  tonvoon
-	* [r520] nagiosplug/branches/release-1.3.0/plugins/t/check_load.t,
+	* [r520] plugins/t/check_load.t:
 	  plugins/t/check_load.t:
 	  Fixed tests (Mathew Ericson - 738607)
 2003-05-17 17:50  tonvoon
-	* [r519] nagiosplug/branches/release-1.3.0/plugins/t/check_procs.t,
+	* [r519] plugins/t/check_procs.t:
 	  plugins/t/check_procs.t:
 	  Fixed test commands (Mathew Ericson - 738605)
 2003-05-17 17:40  tonvoon
-	* [r518] nagiosplug/branches/release-1.3.0/plugins/t/check_http.t,
+	* [r518] plugins/t/check_http.t:
 	  plugins/t/check_http.t:
 	  Fixed tests (Mathew Ericson - 738608)
 2003-05-17 17:36  tonvoon
@ -8261,9 +8548,7 @@
 2003-05-16 17:33  sghosh
-	* [r515]
+	* [r515] plugins-scripts/check_ntp.pl:
 	  nagiosplug/branches/release-1.3.0/plugins-scripts/check_ntp.pl,
 	  plugins-scripts/check_ntp.pl:
 	  bug fix
 2003-05-14 23:17  tonvoon
@ -8332,8 +8617,7 @@
 2003-05-09 03:00  kdebisschop
-	* [r501] nagiosplug/branches/release-1.3.0/plugins/check_snmp.c,
+	* [r501] plugins/check_snmp.c:
 	  plugins/check_snmp.c:
 	  cause snmpget try try for 1 second less than the timeout
 	  (allowing plugin to force close if needed)
@ -8349,16 +8633,12 @@
 2003-04-25 09:07  sghosh
-	* [r499]
+	* [r499] plugins-scripts/check_ntp.pl:
 	  nagiosplug/branches/release-1.3.0/plugins-scripts/check_ntp.pl,
 	  plugins-scripts/check_ntp.pl:
 	  corrected output units
 2003-04-23 04:58  kdebisschop
-	* [r498] nagiosplug/branches/release-1.3.0/plugins/check_http.c,
+	* [r498] plugins/check_http.c:
 	  nagiosplug/branches/release-1.3.0/plugins/utils.c,
 	  plugins/check_http.c:
 	  update to RFC1123 hostname specs
 2003-04-17 05:56  kdebisschop
@ -8573,8 +8853,7 @@
 2003-03-24 00:42  tonvoon
-	* [r452] nagiosplug/branches/release-1.3.0/REQUIREMENTS,
+	* [r452] REQUIREMENTS:
 	  REQUIREMENTS:
 	  Add NSClient requirement for check_nt
 2003-03-24 00:26  tonvoon
@ -8684,9 +8963,7 @@
 2003-03-17 22:24  tonvoon
-	* [r428]
+	* [r428] plugins-scripts/check_oracle.sh:
 	  nagiosplug/branches/release-1.3.0/plugins-scripts/check_oracle.sh,
 	  plugins-scripts/check_oracle.sh:
 	  Allow default Oracle home from oratab (reported by Walbert
 	  Oberngruber)
@ -8872,8 +9149,7 @@
 2003-03-11 22:34  tonvoon
-	* [r397] nagiosplug/branches/release-1.3.0/plugins/negate.c,
+	* [r397] plugins/negate.c:
 	  plugins/negate.c:
 	  Fixed reading too many argv parameters and changed to asprintf
 2003-03-11 22:22  tonvoon
@ -8936,14 +9212,12 @@
 2003-03-09 10:39  tonvoon
-	* [r388] nagiosplug/branches/release-1.3.0/plugins/check_disk.c,
+	* [r388] plugins/check_disk.c:
 	  plugins/check_disk.c:
 	  Implement error-only option for check_disk (Ian Duggan)
 2003-03-08 12:08  tonvoon
-	* [r387] nagiosplug/branches/release-1.3.0/plugins/check_disk.c,
+	* [r387] plugins/check_disk.c:
 	  plugins/check_disk.c:
 	  Fix AIX /proc filesystem (Ian Duggan)
 2003-03-08 11:44  tonvoon
@ -9004,8 +9278,7 @@
 2003-03-08 00:23  tonvoon
-	* [r377] nagiosplug/branches/release-1.3.0/Makefile.am,
+	* [r377] Makefile.am:
 	  Makefile.am:
 	  Use Makefile's variables (to support a shortcut in sfsnapshot)
 2003-03-07 22:11  undrgrid
@ -9027,14 +9300,12 @@
 2003-03-07 07:17  kdebisschop
-	* [r373] nagiosplug/branches/release-1.3.0/plugins/check_smtp.c,
+	* [r373] plugins/check_smtp.c:
 	  plugins/check_smtp.c:
 	  whole timer loop was on the wrong side of connection close code
 2003-03-07 06:43  kdebisschop
-	* [r372] nagiosplug/branches/release-1.3.0/plugins/check_udp.c,
+	* [r372] plugins/check_udp.c:
 	  plugins/check_udp.c:
 	  fix for -H invocation of hostname
 2003-03-06 06:40  undrgrid
@ -11067,9 +11338,6 @@
 2002-02-28 06:42  
-	* [r1] Nagios-Plugin, Nagios-Plugin/branches, Nagios-Plugin/tags,
+	* [r1] .:
 	  Nagios-Plugin/trunk, nagiosmib, nagiosmib/branches,
 	  nagiosmib/tags, nagiosmib/trunk, nagiosplug, nagiosplug/branches,
 	  nagiosplug/tags, .:
 	  New repository initialized by cvs2svn.
--- a/Makefile.am
+++ b/Makefile.am
@ -1,10 +1,10 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
+SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 EXTRA_DIST = config.rpath \
 	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
-	REQUIREMENTS SUPPORT THANKS \
+	NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
 	NPTest.pm contrib pkg nagios-plugins.spec \
 	config_test/Makefile config_test/run_tests config_test/child_test.c \
 	perlmods tools/build_perl_modules \
@ -17,7 +17,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\"
 dist-hook:
 	make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
-	rm -rf `find $(distdir) -name CVS`
+	echo ${VERSION} >$(distdir)/release
 install-root:
 	cd plugins-root && $(MAKE) $@
@ -57,3 +57,4 @@ THANKS: THANKS.in
 pkgclean:
 	rm -rf $(BUILDDIR) $(PACKDIR)
--- a/Makefile.in
+++ b/Makefile.in
@ -46,17 +46,19 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
-	$(top_srcdir)/gl/m4/alloca.m4 \
+	$(top_srcdir)/gl/m4/00gnulib.m4 $(top_srcdir)/gl/m4/alloca.m4 \
 	$(top_srcdir)/gl/m4/arpa_inet_h.m4 \
-	$(top_srcdir)/gl/m4/base64.m4 $(top_srcdir)/gl/m4/c-strtod.m4 \
+	$(top_srcdir)/gl/m4/base64.m4 $(top_srcdir)/gl/m4/btowc.m4 \
-	$(top_srcdir)/gl/m4/cloexec.m4 $(top_srcdir)/gl/m4/codeset.m4 \
+	$(top_srcdir)/gl/m4/c-strtod.m4 $(top_srcdir)/gl/m4/cloexec.m4 \
-	$(top_srcdir)/gl/m4/dirname.m4 $(top_srcdir)/gl/m4/dos.m4 \
+	$(top_srcdir)/gl/m4/codeset.m4 $(top_srcdir)/gl/m4/dirname.m4 \
 	$(top_srcdir)/gl/m4/dos.m4 \
 	$(top_srcdir)/gl/m4/double-slash-root.m4 \
-	$(top_srcdir)/gl/m4/eoverflow.m4 $(top_srcdir)/gl/m4/error.m4 \
+	$(top_srcdir)/gl/m4/errno_h.m4 $(top_srcdir)/gl/m4/error.m4 \
 	$(top_srcdir)/gl/m4/exitfail.m4 \
 	$(top_srcdir)/gl/m4/extensions.m4 \
 	$(top_srcdir)/gl/m4/fcntl-safer.m4 \
-	$(top_srcdir)/gl/m4/float_h.m4 $(top_srcdir)/gl/m4/floorf.m4 \
+	$(top_srcdir)/gl/m4/fcntl_h.m4 $(top_srcdir)/gl/m4/float_h.m4 \
 	$(top_srcdir)/gl/m4/floorf.m4 \
 	$(top_srcdir)/gl/m4/fstypename.m4 \
 	$(top_srcdir)/gl/m4/fsusage.m4 \
 	$(top_srcdir)/gl/m4/getaddrinfo.m4 \
@ -66,7 +68,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
 	$(top_srcdir)/gl/m4/glibc21.m4 \
 	$(top_srcdir)/gl/m4/gnulib-common.m4 \
 	$(top_srcdir)/gl/m4/gnulib-comp.m4 \
-	$(top_srcdir)/gl/m4/iconv.m4 \
+	$(top_srcdir)/gl/m4/hostent.m4 $(top_srcdir)/gl/m4/iconv.m4 \
 	$(top_srcdir)/gl/m4/include_next.m4 \
 	$(top_srcdir)/gl/m4/inet_ntop.m4 $(top_srcdir)/gl/m4/inline.m4 \
 	$(top_srcdir)/gl/m4/intlmacosx.m4 \
@ -75,17 +77,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
 	$(top_srcdir)/gl/m4/lib-ld.m4 $(top_srcdir)/gl/m4/lib-link.m4 \
 	$(top_srcdir)/gl/m4/lib-prefix.m4 \
 	$(top_srcdir)/gl/m4/localcharset.m4 \
 	$(top_srcdir)/gl/m4/locale-fr.m4 \
 	$(top_srcdir)/gl/m4/locale-ja.m4 \
 	$(top_srcdir)/gl/m4/locale-zh.m4 \
 	$(top_srcdir)/gl/m4/longlong.m4 \
 	$(top_srcdir)/gl/m4/ls-mntd-fs.m4 \
 	$(top_srcdir)/gl/m4/malloc.m4 $(top_srcdir)/gl/m4/math_h.m4 \
-	$(top_srcdir)/gl/m4/mbstate_t.m4 \
+	$(top_srcdir)/gl/m4/mbrtowc.m4 $(top_srcdir)/gl/m4/mbsinit.m4 \
 	$(top_srcdir)/gl/m4/mbstate_t.m4 $(top_srcdir)/gl/m4/mktime.m4 \
 	$(top_srcdir)/gl/m4/mountlist.m4 \
 	$(top_srcdir)/gl/m4/multiarch.m4 \
 	$(top_srcdir)/gl/m4/netdb_h.m4 \
 	$(top_srcdir)/gl/m4/netinet_in_h.m4 $(top_srcdir)/gl/m4/nls.m4 \
-	$(top_srcdir)/gl/m4/onceonly_2_57.m4 $(top_srcdir)/gl/m4/po.m4 \
+	$(top_srcdir)/gl/m4/onceonly.m4 $(top_srcdir)/gl/m4/open.m4 \
 	$(top_srcdir)/gl/m4/po.m4 $(top_srcdir)/gl/m4/printf.m4 \
 	$(top_srcdir)/gl/m4/progtest.m4 $(top_srcdir)/gl/m4/regex.m4 \
 	$(top_srcdir)/gl/m4/safe-read.m4 \
 	$(top_srcdir)/gl/m4/safe-write.m4 \
-	$(top_srcdir)/gl/m4/size_max.m4 \
+	$(top_srcdir)/gl/m4/servent.m4 $(top_srcdir)/gl/m4/size_max.m4 \
 	$(top_srcdir)/gl/m4/snprintf.m4 $(top_srcdir)/gl/m4/socklen.m4 \
 	$(top_srcdir)/gl/m4/sockpfaf.m4 $(top_srcdir)/gl/m4/ssize_t.m4 \
 	$(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stdint.m4 \
@ -95,13 +104,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/np_mysqlclient.m4 \
 	$(top_srcdir)/gl/m4/string_h.m4 $(top_srcdir)/gl/m4/strndup.m4 \
 	$(top_srcdir)/gl/m4/strnlen.m4 \
 	$(top_srcdir)/gl/m4/sys_socket_h.m4 \
 	$(top_srcdir)/gl/m4/time_h.m4 $(top_srcdir)/gl/m4/time_r.m4 \
 	$(top_srcdir)/gl/m4/timegm.m4 \
 	$(top_srcdir)/gl/m4/unistd-safer.m4 \
 	$(top_srcdir)/gl/m4/unistd_h.m4 \
 	$(top_srcdir)/gl/m4/vasnprintf.m4 \
 	$(top_srcdir)/gl/m4/vasprintf.m4 \
 	$(top_srcdir)/gl/m4/vsnprintf.m4 $(top_srcdir)/gl/m4/wchar.m4 \
-	$(top_srcdir)/gl/m4/wchar_t.m4 $(top_srcdir)/gl/m4/wctype.m4 \
+	$(top_srcdir)/gl/m4/wchar_t.m4 $(top_srcdir)/gl/m4/wcrtomb.m4 \
-	$(top_srcdir)/gl/m4/wint_t.m4 $(top_srcdir)/gl/m4/xalloc.m4 \
+	$(top_srcdir)/gl/m4/wctype.m4 $(top_srcdir)/gl/m4/wint_t.m4 \
 	$(top_srcdir)/gl/m4/write.m4 $(top_srcdir)/gl/m4/xalloc.m4 \
 	$(top_srcdir)/gl/m4/xsize.m4 $(top_srcdir)/gl/m4/xstrndup.m4 \
 	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@ -140,6 +152,7 @@ ALLOCA_H = @ALLOCA_H@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARPA_INET_H = @ARPA_INET_H@
 AUTOCONF = @AUTOCONF@
@ -170,16 +183,24 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-EOVERFLOW = @EOVERFLOW@
+EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@
 EMULTIHOP_VALUE = @EMULTIHOP_VALUE@
 ENOLINK_HIDDEN = @ENOLINK_HIDDEN@
 ENOLINK_VALUE = @ENOLINK_VALUE@
 EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
 EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
 ERRNO_H = @ERRNO_H@
 EXEEXT = @EXEEXT@
 EXTRAS = @EXTRAS@
 EXTRAS_ROOT = @EXTRAS_ROOT@
 EXTRA_NETOBJS = @EXTRA_NETOBJS@
 EXTRA_TEST = @EXTRA_TEST@
 F77 = @F77@
 FCNTL_H = @FCNTL_H@
 FFLAGS = @FFLAGS@
 FLOAT_H = @FLOAT_H@
 FLOORF_LIBM = @FLOORF_LIBM@
 GETADDRINFO_LIB = @GETADDRINFO_LIB@
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
 GETOPT_H = @GETOPT_H@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
@ -188,47 +209,85 @@ GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@
 GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
 GNULIB_ACCEPT = @GNULIB_ACCEPT@
 GNULIB_ATOLL = @GNULIB_ATOLL@
 GNULIB_BIND = @GNULIB_BIND@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CEILF = @GNULIB_CEILF@
 GNULIB_CEILL = @GNULIB_CEILL@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_CONNECT = @GNULIB_CONNECT@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
 GNULIB_DUP2 = @GNULIB_DUP2@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
 GNULIB_FCHDIR = @GNULIB_FCHDIR@
 GNULIB_FCLOSE = @GNULIB_FCLOSE@
 GNULIB_FFLUSH = @GNULIB_FFLUSH@
 GNULIB_FLOORF = @GNULIB_FLOORF@
 GNULIB_FLOORL = @GNULIB_FLOORL@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
 GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
 GNULIB_FREXP = @GNULIB_FREXP@
 GNULIB_FREXPL = @GNULIB_FREXPL@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
 GNULIB_FSYNC = @GNULIB_FSYNC@
 GNULIB_FTELL = @GNULIB_FTELL@
 GNULIB_FTELLO = @GNULIB_FTELLO@
 GNULIB_FTRUNCATE = @GNULIB_FTRUNCATE@
 GNULIB_FWRITE = @GNULIB_FWRITE@
 GNULIB_GETADDRINFO = @GNULIB_GETADDRINFO@
 GNULIB_GETCWD = @GNULIB_GETCWD@
 GNULIB_GETDELIM = @GNULIB_GETDELIM@
 GNULIB_GETDOMAINNAME = @GNULIB_GETDOMAINNAME@
 GNULIB_GETDTABLESIZE = @GNULIB_GETDTABLESIZE@
 GNULIB_GETHOSTNAME = @GNULIB_GETHOSTNAME@
 GNULIB_GETLINE = @GNULIB_GETLINE@
 GNULIB_GETLOADAVG = @GNULIB_GETLOADAVG@
 GNULIB_GETLOGIN_R = @GNULIB_GETLOGIN_R@
 GNULIB_GETPAGESIZE = @GNULIB_GETPAGESIZE@
 GNULIB_GETPEERNAME = @GNULIB_GETPEERNAME@
 GNULIB_GETSOCKNAME = @GNULIB_GETSOCKNAME@
 GNULIB_GETSOCKOPT = @GNULIB_GETSOCKOPT@
 GNULIB_GETSUBOPT = @GNULIB_GETSUBOPT@
 GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
 GNULIB_INET_NTOP = @GNULIB_INET_NTOP@
 GNULIB_INET_PTON = @GNULIB_INET_PTON@
 GNULIB_ISFINITE = @GNULIB_ISFINITE@
 GNULIB_ISINF = @GNULIB_ISINF@
 GNULIB_ISNAN = @GNULIB_ISNAN@
 GNULIB_ISNAND = @GNULIB_ISNAND@
 GNULIB_ISNANF = @GNULIB_ISNANF@
 GNULIB_ISNANL = @GNULIB_ISNANL@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
 GNULIB_LDEXPL = @GNULIB_LDEXPL@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LISTEN = @GNULIB_LISTEN@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
 GNULIB_MATHL = @GNULIB_MATHL@
 GNULIB_MBRLEN = @GNULIB_MBRLEN@
 GNULIB_MBRTOWC = @GNULIB_MBRTOWC@
 GNULIB_MBSCASECMP = @GNULIB_MBSCASECMP@
 GNULIB_MBSCASESTR = @GNULIB_MBSCASESTR@
 GNULIB_MBSCHR = @GNULIB_MBSCHR@
 GNULIB_MBSCSPN = @GNULIB_MBSCSPN@
 GNULIB_MBSINIT = @GNULIB_MBSINIT@
 GNULIB_MBSLEN = @GNULIB_MBSLEN@
 GNULIB_MBSNCASECMP = @GNULIB_MBSNCASECMP@
 GNULIB_MBSNLEN = @GNULIB_MBSNLEN@
 GNULIB_MBSNRTOWCS = @GNULIB_MBSNRTOWCS@
 GNULIB_MBSPBRK = @GNULIB_MBSPBRK@
 GNULIB_MBSPCASECMP = @GNULIB_MBSPCASECMP@
 GNULIB_MBSRCHR = @GNULIB_MBSRCHR@
 GNULIB_MBSRTOWCS = @GNULIB_MBSRTOWCS@
 GNULIB_MBSSEP = @GNULIB_MBSSEP@
 GNULIB_MBSSPN = @GNULIB_MBSSPN@
 GNULIB_MBSSTR = @GNULIB_MBSSTR@
@ -238,18 +297,37 @@ GNULIB_MEMPCPY = @GNULIB_MEMPCPY@
 GNULIB_MEMRCHR = @GNULIB_MEMRCHR@
 GNULIB_MKDTEMP = @GNULIB_MKDTEMP@
 GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
 GNULIB_OBSTACK_PRINTF = @GNULIB_OBSTACK_PRINTF@
 GNULIB_OBSTACK_PRINTF_POSIX = @GNULIB_OBSTACK_PRINTF_POSIX@
 GNULIB_OPEN = @GNULIB_OPEN@
 GNULIB_PERROR = @GNULIB_PERROR@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
 GNULIB_PUTC = @GNULIB_PUTC@
 GNULIB_PUTCHAR = @GNULIB_PUTCHAR@
 GNULIB_PUTENV = @GNULIB_PUTENV@
 GNULIB_PUTS = @GNULIB_PUTS@
 GNULIB_RANDOM_R = @GNULIB_RANDOM_R@
 GNULIB_RAWMEMCHR = @GNULIB_RAWMEMCHR@
 GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_RECV = @GNULIB_RECV@
 GNULIB_RECVFROM = @GNULIB_RECVFROM@
 GNULIB_ROUND = @GNULIB_ROUND@
 GNULIB_ROUNDF = @GNULIB_ROUNDF@
 GNULIB_ROUNDL = @GNULIB_ROUNDL@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
 GNULIB_SEND = @GNULIB_SEND@
 GNULIB_SENDTO = @GNULIB_SENDTO@
 GNULIB_SETENV = @GNULIB_SETENV@
 GNULIB_SETSOCKOPT = @GNULIB_SETSOCKOPT@
 GNULIB_SHUTDOWN = @GNULIB_SHUTDOWN@
 GNULIB_SIGNBIT = @GNULIB_SIGNBIT@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SOCKET = @GNULIB_SOCKET@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
 GNULIB_STPCPY = @GNULIB_STPCPY@
 GNULIB_STPNCPY = @GNULIB_STPNCPY@
 GNULIB_STRCASESTR = @GNULIB_STRCASESTR@
@ -262,32 +340,57 @@ GNULIB_STRPBRK = @GNULIB_STRPBRK@
 GNULIB_STRSEP = @GNULIB_STRSEP@
 GNULIB_STRSIGNAL = @GNULIB_STRSIGNAL@
 GNULIB_STRSTR = @GNULIB_STRSTR@
 GNULIB_STRTOD = @GNULIB_STRTOD@
 GNULIB_STRTOK_R = @GNULIB_STRTOK_R@
 GNULIB_STRTOLL = @GNULIB_STRTOLL@
 GNULIB_STRTOULL = @GNULIB_STRTOULL@
 GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_TRUNC = @GNULIB_TRUNC@
 GNULIB_TRUNCF = @GNULIB_TRUNCF@
 GNULIB_TRUNCL = @GNULIB_TRUNCL@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
 GNULIB_UNSETENV = @GNULIB_UNSETENV@
 GNULIB_VASPRINTF = @GNULIB_VASPRINTF@
 GNULIB_VDPRINTF = @GNULIB_VDPRINTF@
 GNULIB_VFPRINTF = @GNULIB_VFPRINTF@
 GNULIB_VFPRINTF_POSIX = @GNULIB_VFPRINTF_POSIX@
 GNULIB_VPRINTF = @GNULIB_VPRINTF@
 GNULIB_VPRINTF_POSIX = @GNULIB_VPRINTF_POSIX@
 GNULIB_VSNPRINTF = @GNULIB_VSNPRINTF@
 GNULIB_VSPRINTF_POSIX = @GNULIB_VSPRINTF_POSIX@
 GNULIB_WCRTOMB = @GNULIB_WCRTOMB@
 GNULIB_WCSNRTOMBS = @GNULIB_WCSNRTOMBS@
 GNULIB_WCSRTOMBS = @GNULIB_WCSRTOMBS@
 GNULIB_WCTOB = @GNULIB_WCTOB@
 GNULIB_WCWIDTH = @GNULIB_WCWIDTH@
 GNULIB_WRITE = @GNULIB_WRITE@
 GREP = @GREP@
 HAVE_ARPA_INET_H = @HAVE_ARPA_INET_H@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
 HAVE_CALLOC_POSIX = @HAVE_CALLOC_POSIX@
 HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@
 HAVE_DECL_ASINL = @HAVE_DECL_ASINL@
 HAVE_DECL_ATANL = @HAVE_DECL_ATANL@
 HAVE_DECL_COSL = @HAVE_DECL_COSL@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
 HAVE_DECL_EXPL = @HAVE_DECL_EXPL@
 HAVE_DECL_FREEADDRINFO = @HAVE_DECL_FREEADDRINFO@
 HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@
 HAVE_DECL_GAI_STRERROR = @HAVE_DECL_GAI_STRERROR@
 HAVE_DECL_GETADDRINFO = @HAVE_DECL_GETADDRINFO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
 HAVE_DECL_GETLINE = @HAVE_DECL_GETLINE@
 HAVE_DECL_GETLOADAVG = @HAVE_DECL_GETLOADAVG@
 HAVE_DECL_GETLOGIN_R = @HAVE_DECL_GETLOGIN_R@
 HAVE_DECL_GETNAMEINFO = @HAVE_DECL_GETNAMEINFO@
 HAVE_DECL_INET_NTOP = @HAVE_DECL_INET_NTOP@
 HAVE_DECL_INET_PTON = @HAVE_DECL_INET_PTON@
 HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@
 HAVE_DECL_LOGL = @HAVE_DECL_LOGL@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
 HAVE_DECL_SINL = @HAVE_DECL_SINL@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
 HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@
@ -300,25 +403,46 @@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
 HAVE_DECL_TANL = @HAVE_DECL_TANL@
 HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@
 HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@
 HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
 HAVE_DECL_WCTOB = @HAVE_DECL_WCTOB@
 HAVE_DECL_WCWIDTH = @HAVE_DECL_WCWIDTH@
 HAVE_DPRINTF = @HAVE_DPRINTF@
 HAVE_DUP2 = @HAVE_DUP2@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSYNC = @HAVE_FSYNC@
 HAVE_FTELLO = @HAVE_FTELLO@
 HAVE_FTRUNCATE = @HAVE_FTRUNCATE@
 HAVE_GETDOMAINNAME = @HAVE_GETDOMAINNAME@
 HAVE_GETDTABLESIZE = @HAVE_GETDTABLESIZE@
 HAVE_GETHOSTNAME = @HAVE_GETHOSTNAME@
 HAVE_GETPAGESIZE = @HAVE_GETPAGESIZE@
 HAVE_GETSUBOPT = @HAVE_GETSUBOPT@
 HAVE_GETUSERSHELL = @HAVE_GETUSERSHELL@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
 HAVE_ISNAND = @HAVE_ISNAND@
 HAVE_ISNANF = @HAVE_ISNANF@
 HAVE_ISNANL = @HAVE_ISNANL@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_MALLOC_POSIX = @HAVE_MALLOC_POSIX@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
 HAVE_MBSNRTOWCS = @HAVE_MBSNRTOWCS@
 HAVE_MBSRTOWCS = @HAVE_MBSRTOWCS@
 HAVE_MEMPCPY = @HAVE_MEMPCPY@
 HAVE_MKDTEMP = @HAVE_MKDTEMP@
 HAVE_NETDB_H = @HAVE_NETDB_H@
 HAVE_NETINET_IN_H = @HAVE_NETINET_IN_H@
 HAVE_OS_H = @HAVE_OS_H@
 HAVE_RANDOM_H = @HAVE_RANDOM_H@
 HAVE_RANDOM_R = @HAVE_RANDOM_R@
 HAVE_RAWMEMCHR = @HAVE_RAWMEMCHR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_REALLOC_POSIX = @HAVE_REALLOC_POSIX@
 HAVE_RPMATCH = @HAVE_RPMATCH@
 HAVE_SETENV = @HAVE_SETENV@
 HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
@ -332,8 +456,16 @@ HAVE_STRCHRNUL = @HAVE_STRCHRNUL@
 HAVE_STRNDUP = @HAVE_STRNDUP@
 HAVE_STRPBRK = @HAVE_STRPBRK@
 HAVE_STRSEP = @HAVE_STRSEP@
 HAVE_STRTOD = @HAVE_STRTOD@
 HAVE_STRTOLL = @HAVE_STRTOLL@
 HAVE_STRTOULL = @HAVE_STRTOULL@
 HAVE_STRUCT_ADDRINFO = @HAVE_STRUCT_ADDRINFO@
 HAVE_STRUCT_RANDOM_DATA = @HAVE_STRUCT_RANDOM_DATA@
 HAVE_STRUCT_SOCKADDR_STORAGE = @HAVE_STRUCT_SOCKADDR_STORAGE@
 HAVE_STRVERSCMP = @HAVE_STRVERSCMP@
 HAVE_SYS_BITYPES_H = @HAVE_SYS_BITYPES_H@
 HAVE_SYS_INTTYPES_H = @HAVE_SYS_INTTYPES_H@
 HAVE_SYS_LOADAVG_H = @HAVE_SYS_LOADAVG_H@
 HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
@ -341,14 +473,20 @@ HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNSETENV = @HAVE_UNSETENV@
 HAVE_UNSIGNED_LONG_LONG_INT = @HAVE_UNSIGNED_LONG_LONG_INT@
 HAVE_VASPRINTF = @HAVE_VASPRINTF@
 HAVE_VDPRINTF = @HAVE_VDPRINTF@
 HAVE_WCHAR_H = @HAVE_WCHAR_H@
 HAVE_WCRTOMB = @HAVE_WCRTOMB@
 HAVE_WCSNRTOMBS = @HAVE_WCSNRTOMBS@
 HAVE_WCSRTOMBS = @HAVE_WCSRTOMBS@
 HAVE_WCTYPE_H = @HAVE_WCTYPE_H@
 HAVE_WINSOCK2_H = @HAVE_WINSOCK2_H@
 HAVE_WINT_T = @HAVE_WINT_T@
 HAVE_WS2TCPIP_H = @HAVE_WS2TCPIP_H@
 HAVE__BOOL = @HAVE__BOOL@
 HOSTENT_LIB = @HOSTENT_LIB@
 HOSTNAME = @HOSTNAME@
 INCLUDE_NEXT = @INCLUDE_NEXT@
 INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@ -370,6 +508,10 @@ LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@
 LOCALE_FR = @LOCALE_FR@
 LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOCALE_JA = @LOCALE_JA@
 LOCALE_ZH_CN = @LOCALE_ZH_CN@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@ -382,15 +524,21 @@ MYSQLCFLAGS = @MYSQLCFLAGS@
 MYSQLINCLUDE = @MYSQLINCLUDE@
 MYSQLLIBS = @MYSQLLIBS@
 NEED_SETGID = @NEED_SETGID@
 NETDB_H = @NETDB_H@
 NETINET_IN_H = @NETINET_IN_H@
 NEXT_ARPA_INET_H = @NEXT_ARPA_INET_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
 NEXT_FLOAT_H = @NEXT_FLOAT_H@
 NEXT_MATH_H = @NEXT_MATH_H@
 NEXT_NETDB_H = @NEXT_NETDB_H@
 NEXT_NETINET_IN_H = @NEXT_NETINET_IN_H@
 NEXT_STDINT_H = @NEXT_STDINT_H@
 NEXT_STDIO_H = @NEXT_STDIO_H@
 NEXT_STDLIB_H = @NEXT_STDLIB_H@
 NEXT_STRING_H = @NEXT_STRING_H@
 NEXT_SYS_SOCKET_H = @NEXT_SYS_SOCKET_H@
 NEXT_TIME_H = @NEXT_TIME_H@
 NEXT_UNISTD_H = @NEXT_UNISTD_H@
 NEXT_WCHAR_H = @NEXT_WCHAR_H@
 NEXT_WCTYPE_H = @NEXT_WCTYPE_H@
@ -432,16 +580,23 @@ PKG_ARCH = @PKG_ARCH@
 PLUGIN_TEST = @PLUGIN_TEST@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PST3CFLAGS = @PST3CFLAGS@
 PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
 PYTHON = @PYTHON@
 RADIUSLIBS = @RADIUSLIBS@
 RANLIB = @RANLIB@
 RELEASE = @RELEASE@
 RELEASE_PRESENT_FALSE = @RELEASE_PRESENT_FALSE@
 RELEASE_PRESENT_TRUE = @RELEASE_PRESENT_TRUE@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CEILF = @REPLACE_CEILF@
 REPLACE_CEILL = @REPLACE_CEILL@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_FCHDIR = @REPLACE_FCHDIR@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
 REPLACE_FLOORF = @REPLACE_FLOORF@
 REPLACE_FLOORL = @REPLACE_FLOORL@
@ -457,12 +612,28 @@ REPLACE_FTELLO = @REPLACE_FTELLO@
 REPLACE_GETCWD = @REPLACE_GETCWD@
 REPLACE_GETLINE = @REPLACE_GETLINE@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
 REPLACE_ISFINITE = @REPLACE_ISFINITE@
 REPLACE_ISINF = @REPLACE_ISINF@
 REPLACE_ISNAN = @REPLACE_ISNAN@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
 REPLACE_LDEXPL = @REPLACE_LDEXPL@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_MBRLEN = @REPLACE_MBRLEN@
 REPLACE_MBRTOWC = @REPLACE_MBRTOWC@
 REPLACE_MBSINIT = @REPLACE_MBSINIT@
 REPLACE_MBSNRTOWCS = @REPLACE_MBSNRTOWCS@
 REPLACE_MBSRTOWCS = @REPLACE_MBSRTOWCS@
 REPLACE_MBSTATE_T = @REPLACE_MBSTATE_T@
 REPLACE_MEMMEM = @REPLACE_MEMMEM@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_NAN = @REPLACE_NAN@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
 REPLACE_OBSTACK_PRINTF = @REPLACE_OBSTACK_PRINTF@
 REPLACE_OPEN = @REPLACE_OPEN@
 REPLACE_PERROR = @REPLACE_PERROR@
 REPLACE_PRINTF = @REPLACE_PRINTF@
 REPLACE_PUTENV = @REPLACE_PUTENV@
 REPLACE_ROUND = @REPLACE_ROUND@
@ -472,19 +643,32 @@ REPLACE_SIGNBIT = @REPLACE_SIGNBIT@
 REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
 REPLACE_STRCASESTR = @REPLACE_STRCASESTR@
 REPLACE_STRDUP = @REPLACE_STRDUP@
 REPLACE_STRERROR = @REPLACE_STRERROR@
 REPLACE_STRPTIME = @REPLACE_STRPTIME@
 REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
 REPLACE_STRSTR = @REPLACE_STRSTR@
 REPLACE_STRTOD = @REPLACE_STRTOD@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TRUNCL = @REPLACE_TRUNCL@
 REPLACE_VASPRINTF = @REPLACE_VASPRINTF@
 REPLACE_VDPRINTF = @REPLACE_VDPRINTF@
 REPLACE_VFPRINTF = @REPLACE_VFPRINTF@
 REPLACE_VPRINTF = @REPLACE_VPRINTF@
 REPLACE_VSNPRINTF = @REPLACE_VSNPRINTF@
 REPLACE_VSPRINTF = @REPLACE_VSPRINTF@
 REPLACE_WCRTOMB = @REPLACE_WCRTOMB@
 REPLACE_WCSNRTOMBS = @REPLACE_WCSNRTOMBS@
 REPLACE_WCSRTOMBS = @REPLACE_WCSRTOMBS@
 REPLACE_WCTOB = @REPLACE_WCTOB@
 REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
 REPLACE_WRITE = @REPLACE_WRITE@
 REV_DATESTAMP = @REV_DATESTAMP@
 REV_TIMESTAMP = @REV_TIMESTAMP@
 SCRIPT_TEST = @SCRIPT_TEST@
 SERVENT_LIB = @SERVENT_LIB@
 SET_MAKE = @SET_MAKE@
 SH = @SH@
 SHELL = @SHELL@
@ -498,6 +682,11 @@ STDINT_H = @STDINT_H@
 STRIP = @STRIP@
 SUPPORT = @SUPPORT@
 SYS_SOCKET_H = @SYS_SOCKET_H@
 SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@
 TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 USE_LIBTAP_LOCAL_FALSE = @USE_LIBTAP_LOCAL_FALSE@
 USE_LIBTAP_LOCAL_TRUE = @USE_LIBTAP_LOCAL_TRUE@
 USE_NLS = @USE_NLS@
 USE_PARSE_INI_FALSE = @USE_PARSE_INI_FALSE@
 USE_PARSE_INI_TRUE = @USE_PARSE_INI_TRUE@
@ -565,10 +754,10 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 with_trusted_path = @with_trusted_path@
-SUBDIRS = gl lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
+SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
 EXTRA_DIST = config.rpath \
 	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CODING FAQ LEGAL NEWS \
-	REQUIREMENTS SUPPORT THANKS \
+	NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
 	NPTest.pm contrib pkg nagios-plugins.spec \
 	config_test/Makefile config_test/run_tests config_test/child_test.c \
 	perlmods tools/build_perl_modules \
@ -1027,7 +1216,7 @@ uninstall-info: uninstall-info-recursive
 dist-hook:
 	make THANKS nagios-plugins.spec pkg/fedora/nagios-plugins.spec
-	rm -rf `find $(distdir) -name CVS`
+	echo ${VERSION} >$(distdir)/release
 install-root:
 	cd plugins-root && $(MAKE) $@
--- a/56
+++ b/56
@ -1,5 +1,61 @@
 This file documents the major additions and syntax changes between releases.
 1.4.14 ...
 	check_http has options to specify the HTTP method (#2155152)
 	check_users thresholds were not working exactly as documented (>= rather than >)
 	Updated tinderbox_build script to point to new tinderbox server
 	check_ifoperstatus -n flag now works as expected (sf.net #1569488)
 	check_ifoperstatus now supports ifType based lookup for ifIndex
 	check_ups now sends a LOGOUT string (debian bug #387001)
 	Extra-opts (C plugins) now allows both '#' and ';' for comments (like N::P)
 	Extra-opts (C plugins) does not allow trailing comments anymore (like N::P)
 	Fixed dependency issue on libtap when ./configure --enable-libtap used. Warning: will install libtap
 	Fixed segfault in extra-opts under some circumstance when reading multiple sections
 	Fix long options parsing in check_disk, check_dns, check_mrtg, check_mrtgtraf and check_tcp
 	Add missing long options for check_nt (for use with extra-opts)
 	check_icmp now reports min and max round trip time perfdata (Steve Rader)
 	Fixed check_http bug where additional headers with redirection caused a segfault (Dieter Van de Walle - 2089159)
 	check_disk: make autofs mount paths specified with -p before we determine the mount list (Erik Welch)
 	Fixed buffer overflow in check_ntp/check_ntp_peer (#1999319, Ubuntu #291265)
 	Re-bundled libtap as a built-in library (--enable-libtap): detects system library as pre-1.4.13 and does not install the built-in library anymore
 	Fixed check_mrtg returning UNKNOWN instead of OK (bug #2378068)
 	Fixed check_http behaviour: all check are now performed as long as a valid response is returned (sf.net #1460312)
 	check_http --onredirect=sticky follows using the same IP address (sf.net #2550208)
 	check_http --onredirect=stickyport also follows the same port
 	Fixed coredump from check_nt when invalid drive is specified (#2179754 - Olli Hauer)
 	Fixed crash from check_nt when -H unspecified or given multiple times (sf.net #2731755, debian #521097)
 	Fixed passing of quotes in OID for check_snmp (#1985230 - Jan Wagner, patch by John Barbuto)
 	Fixed check_http sending HTTP/1.0 with v1.1 headers (#2638765)
 	Fixed check_http not timing-out on redirects
 	Fixed negate not printing the real timeout in ALRM handler when left to default
 	negate timeout result is now configurable
 	Fixed segfault in check_mysql with old slaves (#2696823 - Oskar Ahner)
 	check_nt can return UNKNOWN on timeouts (-u)
 	Fixed typos for check_disk (Chris Pepper)
 	Fixed check_mysql* not using password set in my.cnf (#2531905 - Ben Timby) - Specify an empty password explicitly if you need to override it.
 	Fixed awk subst.in/subst script path error (#2722832 - Martin Foster)
 	check_http: Add SSL/TLS hostname extension support (SNI) - (#1939022 - Joe Presbrey)
 	Fixed wrong perfdata label for output traffic in check_mrtgtraf (#2654308 - Gavin Williams)
 	Fixed check_by_ssh interpretation of quotes in -C parameter (#1985246, #2268675)
 	check_snmp now supports standard threshold ranges and doubles (floating numbers) in thresholds
 	check_fping now supports passing target timeout and interval to fping (#2347686 - Martin Foster)
 	Fixed SNMPv3 behaviour of check_ifoperstatus and check_ifstatus. Added -P to define privprotocol (#2343438 - Robin Schroeder)
 	check_ifoperstatus and check_ifstatus are now more user-friendly in case of missing arguments
 1.4.13 25th Sept 2008
 	Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)
 	Optimised pst3 for systems with large number of processes (Duncan Ferguson)
 	Updated Nagios::Plugin to 0.27
 	Fix Debian bug #479013: check_dig's -l is mandatory now (sf.net #1986306)
 	check_dig now returns CRITICAL instead of WARNING when no answer section is found
 	check_procs now captures stderr in external command and adds to plugin output
 	check_snmp now only prints perfdata for non numeric values (#1867716)
 	check_icmp now supports packet size modification
 	check_http -e now accepts a comma-delimited list of expected status codes (Sven Nierlein)
 	libtap now included with this distribution for easier testing. Run ./configure with --enable-libtap
 	check_ntp_peer/check_ntp_time used to show port in --help but ignored the argument - now implemented
 	Fix possible segfault in check_ntp_peer with deliberately invalid packets
 1.4.12 27th May 2008
 	Added ./check_nt -v INSTANCES to count number of instances (Alessandro Ren)
 	New check_icmp -s option to specify the source IP address
--- a/53
+++ b/53
@ -0,0 +1,53 @@
 #!/bin/sh
 #
 # This is from the Git repository (GIT-VERSION-GEN with modifications)
 #
 SRC_ROOT=`dirname $0`
 NPVF=NP-VERSION-FILE
 DEF_VER=1.4.13.git
 LF='
 '
 # First try git-describe, then svn info, then default.
 if test -d $SRC_ROOT/.git -o -f $SRC_ROOT/.git &&
 	VN=`cd $SRC_ROOT; git describe --abbrev=4 HEAD 2>/dev/null` &&
 	case "$VN" in
 	*$LF*) (exit 1) ;;
 	release-[0-9]*)
 		git update-index -q --refresh
 		test -z "`git diff-index --name-only HEAD --`" ||
 		VN="$VN-dirty" ;;
 	esac
 then
 	VN=`echo "$VN" | sed -e 's/^release-//' | sed -e 's/-/./g'`;
 elif test -d $SRC_ROOT/.svn -o -f $SRC_ROOT/.svn &&
 	VN=`cd $SRC_ROOT; svn info 2>/dev/null | grep '^Revision'` &&
 	case "$VN" in
 	*$LF*) (exit 1) ;;
 	Revision:*)
 		VN=`echo $VN | awk '{print $NF}'`
 		test "`svn status 2>/dev/null | grep '^[AMD]' | wc -l | tr -d ' '`" = 0 ||
 		VN="$VN-dirty" ;;
 	esac
 then
 	VN=`echo "trunk.$VN" | sed -e 's/-/./g'`;
 else
 	VN="$DEF_VER"
 fi
 VN=`expr "$VN" : v*'\(.*\)'`
 if test -r $NPVF
 then
 	VC=`sed -e 's/^NP_VERSION = //' <$NPVF`
 else
 	VC=unset
 fi
 test "$VN" = "$VC" || {
 	echo >&2 "NP_VERSION = $VN"
 	echo "NP_VERSION = $VN" >$NPVF
 }
--- a/NPTest.pm
+++ b/NPTest.pm
@ -21,7 +21,7 @@ use Data::Dumper;
 use Test;
 use vars qw($VERSION);
-$VERSION = do { my @r = (q$Revision: 1556 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r }; # must be all one line, for MakeMaker
+$VERSION = "1556."; # must be all one line, for MakeMaker
 =head1 NAME
@ -625,10 +625,10 @@ sub testCmd {
 	chomp $output;
 	$object->output($output);
 	my ($pkg, $file, $line) = caller(0);
 	print "Testing: $command", $/;
 	if ($ENV{'NPTEST_DEBUG'}) {
 		my ($pkg, $file, $line) = caller(0);
 		print "testCmd: Called from line $line in $file", $/;
 		print "Testing: $command", $/;
 		print "Output:  ", $object->output, $/;
 		print "Return code: ", $object->return_code, $/;
 	}
--- a/20
+++ b/20
@ -5,6 +5,7 @@ raising bug reports, creating patches or contributing new plugins.
 dag rob?le
 fabiodds
 Randy O'Meara
 Oskar Ahner
 Lance Albertson
 David Alden
 Rodger Allen
@ -20,11 +21,13 @@ Markus Baertschi
 Bradley Baetz
 Michael Bakker
 Nobuhiro Ban
 John Barbuto
 Jeremy Baumgartner
 Andreas Behal
 Lutz Behnke
 Marlo Bell
 Simon Bellwood
 Hilko Bengen
 Allan Bennett
 Guy Van Den Bergh
 Tom Bertelston
@ -81,6 +84,7 @@ James Fidell
 Johan Fischer
 Bernhard Fischer
 Matthias Flacke
 Martin Foster
 Felix Frank
 Rick Frey
 Matt Garrett
@ -98,23 +102,27 @@ Jon Hallett
 Steve Hanselman
 Ask Bjoern Hansen
 Michael Haro
 Olli Hauer
 Gunnar Hellekson
 Johannes Herlitz
 Ian Holsman
 Peter Hoogendijk
 Jason Hoos
 Richard Edward Horner
 Chester Hosey
 Bob Ingraham
 Cire Iriarte
 Valdimir Ivaschenko
 Harald Jenny
 Mark Jewiss
 Nikita Kalabukhov
 Frank Kannemann
 Roy Sigurd Karlsbakk
 Jason Kau
 Bo Kersey
 Serhan Kiymaz
 Denis Knauf
 Tilman Koschnick
 John Koyle
 Steven Kreuzer
 Christoph Kron
@ -125,6 +133,7 @@ Gerhard Lausser
 Lynne Lawrence
 Sakari Lehtonen
 Pedro Leite
 Jan Lipphaus
 Larry Low
 Jacob Lundqvist
 Guenther Mair
@ -153,12 +162,14 @@ Jan-Frode Myklebust
 Sivakumar Nellurandi
 Truongchinh Nguyen
 Simon L Nielsen
 Sven Nierlein
 Thomas Nilsen
 Walbert Oberngruber
 Craig Orsinger
 Remi Paulmier
 Tom Payerle
 Fabian Pehla
 Chris Pepper
 Matt Perry
 Matthew Peters
 William Pietri
@ -168,8 +179,12 @@ Ari Pollak
 Marc Poulin
 Matt Pounsett
 Peter Pramberger
 Joe Presbrey
 Will Preston
 Arnaud Quette
 Darian Rackham
 Steve Rader
 Olivier 'Babar' Raginel
 Phil Randal
 Abid Rasheed
 Jeremy Reed
@ -204,12 +219,14 @@ Tom Shields
 Sean Shore
 Antony Simmonds
 John Sivak
 Nik Soggia
 Lars Stavholm
 Nikolay Sturm
 David Sullivan
 Kjell Sundtjonn
 Ziya Suzen
 Michael Tiernan
 Ben Timby
 Ronald Tin
 Ibere Tizio
 Julien Touche
@ -225,10 +242,13 @@ Robert August Vincent
 Dave Viner
 Nathan Vonnahme
 Jan Wagner
 Dieter Van de Walle
 John Warburton
 Christian G Warden
 Erik Wasser
 Stuart Webster
 Holger Weiss
 Erik Welch
 Torsten Werner
 Ben Whaley
 Adrian Wieczorek
--- a/acinclude.m4
+++ b/acinclude.m4
@ -8,7 +8,6 @@ dnl e.g. 6 arguments (linux)
 dnl e.g. 5 arguments (solaris)
 dnl e.g. 3 arguments (osf/1)
 dnl
 dnl @version $Id: acinclude.m4 805 2004-02-18 14:56:39Z kdebisschop $
 dnl @author Brian Stafford <brian@stafford.uklinux.net>
 dnl
 dnl based on version by Caolan McNamara <caolan@skynet.ie>
--- a/aclocal.m4
+++ b/aclocal.m4
@ -7258,20 +7258,23 @@ AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 m4_include([m4/np_mysqlclient.m4])
 m4_include([gl/m4/00gnulib.m4])
 m4_include([gl/m4/alloca.m4])
 m4_include([gl/m4/arpa_inet_h.m4])
 m4_include([gl/m4/base64.m4])
 m4_include([gl/m4/btowc.m4])
 m4_include([gl/m4/c-strtod.m4])
 m4_include([gl/m4/cloexec.m4])
 m4_include([gl/m4/codeset.m4])
 m4_include([gl/m4/dirname.m4])
 m4_include([gl/m4/dos.m4])
 m4_include([gl/m4/double-slash-root.m4])
-m4_include([gl/m4/eoverflow.m4])
+m4_include([gl/m4/errno_h.m4])
 m4_include([gl/m4/error.m4])
 m4_include([gl/m4/exitfail.m4])
 m4_include([gl/m4/extensions.m4])
 m4_include([gl/m4/fcntl-safer.m4])
 m4_include([gl/m4/fcntl_h.m4])
 m4_include([gl/m4/float_h.m4])
 m4_include([gl/m4/floorf.m4])
 m4_include([gl/m4/fstypename.m4])
@ -7284,6 +7287,7 @@ m4_include([gl/m4/gettext.m4])
 m4_include([gl/m4/glibc21.m4])
 m4_include([gl/m4/gnulib-common.m4])
 m4_include([gl/m4/gnulib-comp.m4])
 m4_include([gl/m4/hostent.m4])
 m4_include([gl/m4/iconv.m4])
 m4_include([gl/m4/include_next.m4])
 m4_include([gl/m4/inet_ntop.m4])
@ -7295,20 +7299,31 @@ m4_include([gl/m4/lib-ld.m4])
 m4_include([gl/m4/lib-link.m4])
 m4_include([gl/m4/lib-prefix.m4])
 m4_include([gl/m4/localcharset.m4])
 m4_include([gl/m4/locale-fr.m4])
 m4_include([gl/m4/locale-ja.m4])
 m4_include([gl/m4/locale-zh.m4])
 m4_include([gl/m4/longlong.m4])
 m4_include([gl/m4/ls-mntd-fs.m4])
 m4_include([gl/m4/malloc.m4])
 m4_include([gl/m4/math_h.m4])
 m4_include([gl/m4/mbrtowc.m4])
 m4_include([gl/m4/mbsinit.m4])
 m4_include([gl/m4/mbstate_t.m4])
 m4_include([gl/m4/mktime.m4])
 m4_include([gl/m4/mountlist.m4])
 m4_include([gl/m4/multiarch.m4])
 m4_include([gl/m4/netdb_h.m4])
 m4_include([gl/m4/netinet_in_h.m4])
 m4_include([gl/m4/nls.m4])
-m4_include([gl/m4/onceonly_2_57.m4])
+m4_include([gl/m4/onceonly.m4])
 m4_include([gl/m4/open.m4])
 m4_include([gl/m4/po.m4])
 m4_include([gl/m4/printf.m4])
 m4_include([gl/m4/progtest.m4])
 m4_include([gl/m4/regex.m4])
 m4_include([gl/m4/safe-read.m4])
 m4_include([gl/m4/safe-write.m4])
 m4_include([gl/m4/servent.m4])
 m4_include([gl/m4/size_max.m4])
 m4_include([gl/m4/snprintf.m4])
 m4_include([gl/m4/socklen.m4])
@ -7325,6 +7340,9 @@ m4_include([gl/m4/string_h.m4])
 m4_include([gl/m4/strndup.m4])
 m4_include([gl/m4/strnlen.m4])
 m4_include([gl/m4/sys_socket_h.m4])
 m4_include([gl/m4/time_h.m4])
 m4_include([gl/m4/time_r.m4])
 m4_include([gl/m4/timegm.m4])
 m4_include([gl/m4/unistd-safer.m4])
 m4_include([gl/m4/unistd_h.m4])
 m4_include([gl/m4/vasnprintf.m4])
@ -7332,8 +7350,10 @@ m4_include([gl/m4/vasprintf.m4])
 m4_include([gl/m4/vsnprintf.m4])
 m4_include([gl/m4/wchar.m4])
 m4_include([gl/m4/wchar_t.m4])
 m4_include([gl/m4/wcrtomb.m4])
 m4_include([gl/m4/wctype.m4])
 m4_include([gl/m4/wint_t.m4])
 m4_include([gl/m4/write.m4])
 m4_include([gl/m4/xalloc.m4])
 m4_include([gl/m4/xsize.m4])
 m4_include([gl/m4/xstrndup.m4])
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@ -47,7 +47,7 @@ for cc_temp in $CC""; do
 done
 cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+# Code taken from libtool.m4's _LT_COMPILER_PIC.
 wl=
 if test "$GCC" = yes; then
@ -64,7 +64,7 @@ else
          ;;
      esac
      ;;
-    mingw* | cygwin* | pw32* | os2*)
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
      ;;
    hpux9* | hpux10* | hpux11*)
      wl='-Wl,'
@ -76,7 +76,13 @@ else
      ;;
    linux* | k*bsd*-gnu)
      case $cc_basename in
-        icc* | ecc*)
+        ecc*)
          wl='-Wl,'
          ;;
        icc* | ifort*)
          wl='-Wl,'
          ;;
        lf95*)
          wl='-Wl,'
          ;;
        pgcc | pgf77 | pgf90)
@ -124,7 +130,7 @@ else
  esac
 fi
-# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
 hardcode_libdir_flag_spec=
 hardcode_libdir_separator=
@ -132,7 +138,7 @@ hardcode_direct=no
 hardcode_minus_L=no
 case "$host_os" in
-  cygwin* | mingw* | pw32*)
+  cygwin* | mingw* | pw32* | cegcc*)
    # FIXME: the MSVC++ port hasn't been tested in a loooong time
    # When not using gcc, we currently assume that we are using
    # Microsoft Visual C++.
@ -182,7 +188,7 @@ if test "$with_gnu_ld" = yes; then
        ld_shlibs=no
      fi
      ;;
-    cygwin* | mingw* | pw32*)
+    cygwin* | mingw* | pw32* | cegcc*)
      # hardcode_libdir_flag_spec is actually meaningless, as there is
      # no search path for DLLs.
      hardcode_libdir_flag_spec='-L$libdir'
@ -326,7 +332,7 @@ else
      ;;
    bsdi[45]*)
      ;;
-    cygwin* | mingw* | pw32*)
+    cygwin* | mingw* | pw32* | cegcc*)
      # When not using gcc, we currently assume that we are using
      # Microsoft Visual C++.
      # hardcode_libdir_flag_spec is actually meaningless, as there is
@ -494,7 +500,7 @@ else
 fi
 # Check dynamic linker characteristics
-# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
 # Unlike libtool.m4, here we don't care about _all_ names of the library, but
 # only about the one the linker finds when passed -lNAME. This is the last
 # element of library_names_spec in libtool.m4, or possibly two of them if the
@ -517,7 +523,7 @@ case "$host_os" in
  bsdi[45]*)
    library_names_spec='$libname$shrext'
    ;;
-  cygwin* | mingw* | pw32*)
+  cygwin* | mingw* | pw32* | cegcc*)
    shrext=.dll
    library_names_spec='$libname.dll.a $libname.lib'
    ;;
--- a/command.cfg.in
+++ b/command.cfg.in
@ -1,8 +1,6 @@
 ###############################################################################
 # COMMAND CONFIGURATION
 #
 # $Id: command.cfg.in 973 2004-12-02 04:48:37Z mattkent $
 #
 # SYNTAX:
 # command[<command_name>]=<command_line>
 #
--- a/config.h.in
+++ b/config.h.in
@ -1,5 +1,9 @@
 /* config.h.in.  Generated from configure.in by autoheader.  */
 /* Define if the compiler is building for multiple architectures of Apple
   platforms at once. */
 #undef AA_APPLE_UNIVERSAL_BUILD
 /* Define to the number of bits in type 'ptrdiff_t'. */
 #undef BITSIZEOF_PTRDIFF_T
@ -45,9 +49,6 @@
   language is requested. */
 #undef ENABLE_NLS
 /* Define as good substitute value for EOVERFLOW. */
 #undef EOVERFLOW
 /* Define on systems for which file names may have a so-called `drive letter'
   prefix, define this to compute the length of that prefix, including the
   colon. */
@ -71,6 +72,12 @@
 /* Define to indicate the 'malloc' module. */
 #undef GNULIB_MALLOC_GNU
 /* Define to 1 when using the gnulib module open. */
 #undef GNULIB_OPEN
 /* Define to 1 if you have the `alarm' function. */
 #undef HAVE_ALARM
 /* Define to 1 if you have 'alloca' after including <alloca.h>, a header that
   may be supplied by this distribution. */
 #undef HAVE_ALLOCA
@ -82,6 +89,9 @@
 /* Define to 1 if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 /* Define to 1 if you have the `btowc' function. */
 #undef HAVE_BTOWC
 /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
   CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
@ -168,6 +178,10 @@
   don't. */
 #undef HAVE_DECL_SYSCONF
 /* Define to 1 if you have the declaration of `timegm', and to 0 if you don't.
   */
 #undef HAVE_DECL_TIMEGM
 /* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
   don't. */
 #undef HAVE_DECL_VSNPRINTF
@ -188,6 +202,9 @@
 /* Define to 1 if you have the <err.h> header file. */
 #undef HAVE_ERR_H
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 /* Define to 1 if you have the <features.h> header file. */
 #undef HAVE_FEATURES_H
@ -224,6 +241,9 @@
 /* Define to 1 if you have the `getopt_long_only' function. */
 #undef HAVE_GETOPT_LONG_ONLY
 /* Define to 1 if you have the `getservbyname' function. */
 #undef HAVE_GETSERVBYNAME
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
@ -239,9 +259,6 @@
 /* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 /* Define if your compiler supports the #include_next directive. */
 #undef HAVE_INCLUDE_NEXT
 /* Define to 1 if you have the `inet_ntop' function. */
 #undef HAVE_INET_NTOP
@ -305,6 +322,9 @@
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
 /* Define to 1 if you have the `kstat' library (-lkstat). */
 #undef HAVE_LIBKSTAT
@ -320,6 +340,9 @@
 /* Define to 1 if you have the <libpq-fe.h> header file. */
 #undef HAVE_LIBPQ_FE_H
 /* Define to 1 if you have the `pthread' library (-lpthread). */
 #undef HAVE_LIBPTHREAD
 /* Define to 1 if you have the `radiusclient' library (-lradiusclient). */
 #undef HAVE_LIBRADIUSCLIENT
@ -352,6 +375,9 @@
 /* Define to 1 if you have the `mbrtowc' function. */
 #undef HAVE_MBRTOWC
 /* Define to 1 if you have the `mbsinit' function. */
 #undef HAVE_MBSINIT
 /* Define to 1 if <wchar.h> declares mbstate_t. */
 #undef HAVE_MBSTATE_T
@ -418,12 +444,18 @@
 /* Define to 1 if you have the `pstat_getdynamic' function. */
 #undef HAVE_PSTAT_GETDYNAMIC
 /* Define to 1 if you have the <random.h> header file. */
 #undef HAVE_RANDOM_H
 /* Define to 1 if you have the <rsa.h> header file. */
 #undef HAVE_RSA_H
 /* Define to 1 if you have the `select' function. */
 #undef HAVE_SELECT
 /* Define to 1 if you have the `shutdown' function. */
 #undef HAVE_SHUTDOWN
 /* Define to 1 if you have the <signal.h> header file. */
 #undef HAVE_SIGNAL_H
@ -482,6 +514,9 @@
 /* Define if you have the strndup() function and it works. */
 #undef HAVE_STRNDUP
 /* Define to 1 if you have the `strnlen' function. */
 #undef HAVE_STRNLEN
 /* Define to 1 if you have the `strstr' function. */
 #undef HAVE_STRSTR
@ -500,6 +535,15 @@
 /* Define to 1 if `n_un.n_name' is member of `struct nlist'. */
 #undef HAVE_STRUCT_NLIST_N_UN_N_NAME
 /* Define to 1 if the system has the type `struct random_data'. */
 #undef HAVE_STRUCT_RANDOM_DATA
 /* Define to 1 if `sa_len' is member of `struct sockaddr'. */
 #undef HAVE_STRUCT_SOCKADDR_SA_LEN
 /* Define to 1 if the system has the type `struct sockaddr_storage'. */
 #undef HAVE_STRUCT_SOCKADDR_STORAGE
 /* Define to 1 if `f_fstypename' is member of `struct statfs'. */
 #undef HAVE_STRUCT_STATFS_F_FSTYPENAME
@ -539,6 +583,9 @@
 /* Define to 1 if you have the <sys/inttypes.h> header file. */
 #undef HAVE_SYS_INTTYPES_H
 /* Define to 1 if you have the <sys/loadavg.h> header file. */
 #undef HAVE_SYS_LOADAVG_H
 /* Define to 1 if you have the <sys/mntent.h> header file. */
 #undef HAVE_SYS_MNTENT_H
@ -590,6 +637,12 @@
 /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 #undef HAVE_SYS_WAIT_H
 /* Define to 1 if you have the `timegm' function. */
 #undef HAVE_TIMEGM
 /* Define to 1 if you have the <time.h> header file. */
 #undef HAVE_TIME_H
 /* Define to 1 if you have the <uio.h> header file. */
 #undef HAVE_UIO_H
@ -629,6 +682,9 @@
 /* Define to 1 if you have the `wcslen' function. */
 #undef HAVE_WCSLEN
 /* Define to 1 if you have the `wcsnlen' function. */
 #undef HAVE_WCSNLEN
 /* Define to 1 if you have the <wctype.h> header file. */
 #undef HAVE_WCTYPE_H
@ -638,6 +694,12 @@
 /* Define if you have the 'wint_t' type. */
 #undef HAVE_WINT_T
 /* Define to 1 if O_NOATIME works. */
 #undef HAVE_WORKING_O_NOATIME
 /* Define to 1 if O_NOFOLLOW works. */
 #undef HAVE_WORKING_O_NOFOLLOW
 /* Define to 1 if you have the <ws2tcpip.h> header file. */
 #undef HAVE_WS2TCPIP_H
@ -656,6 +718,15 @@
 # define ISSLASH(C) ((C) == '/')
 #endif
 /* Define if the mbrtowc function has the NULL string argument bug. */
 #undef MBRTOWC_NULL_ARG_BUG
 /* Define if the mbrtowc function does not return 0 for a NUL character. */
 #undef MBRTOWC_NUL_RETVAL_BUG
 /* Define if the mbrtowc function returns a wrong return value. */
 #undef MBRTOWC_RETVAL_BUG
 /* Define if there is no specific function for reading the list of mounted
   file systems. fread will be used to read /etc/mnttab. (SVR2) */
 #undef MOUNTED_FREAD
@ -721,6 +792,9 @@
 /* path and args for nslookup */
 #undef NSLOOKUP_COMMAND
 /* Define to 1 if open() fails to recognize a trailing slash. */
 #undef OPEN_TRAILING_SLASH_BUG
 /* Name of package */
 #undef PACKAGE
@ -956,6 +1030,9 @@
 /* Define if you want regoff_t to be at least as wide POSIX requires. */
 #undef _REGEX_LARGE_OFFSETS
 /* Define to 500 only on HP-UX. */
 #undef _XOPEN_SOURCE
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
@ -1006,12 +1083,25 @@
 /* Define to long or long long if <stdint.h> and <inttypes.h> don't define. */
 #undef intmax_t
 /* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
   __APPLE__ && __MACH__ test for MacOS X.
   __APPLE_CC__ tests for the Apple compiler and its version.
   __STDC_VERSION__ tests for the C99 mode.  */
 #if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
 # define __GNUC_STDC_INLINE__ 1
 #endif
 /* Define to rpl_malloc if the replacement function should be used. */
 #undef malloc
 /* Define to a type if <wchar.h> does not define. */
 #undef mbstate_t
 /* Define to rpl_mktime if the replacement function should be used. */
 #undef mktime
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
@ -1088,3 +1178,13 @@
 /* Define to rpl_strnlen if the replacement function should be used. */
 #undef strnlen
 /* Define as a marker that can be attached to function parameter declarations
   for parameters that are not used.  This helps to reduce warnings, such as
   from GCC -Wunused-parameter.  */
 #if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
 # define _UNUSED_PARAMETER_ __attribute__ ((__unused__))
 #else
 # define _UNUSED_PARAMETER_
 #endif
--- a/11961
+++ b/11961
--- a/configure.in
+++ b/configure.in
@ -1,7 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION ($Revision: 2004 $)
 AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.4.12)
+AC_INIT(nagios-plugins,1.4.13)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES(gl/Makefile)
 AC_CONFIG_AUX_DIR(build-aux)
@ -99,6 +98,9 @@ AC_SUBST(PKG_ARCH)
 AC_SUBST(REV_DATESTAMP)
 AC_SUBST(REV_TIMESTAMP)
 dnl Check if version file is present
 AM_CONDITIONAL([RELEASE_PRESENT], [test -f release])
 dnl Checks for programs.
 AC_PATH_PROG(PYTHON,python)
 AC_PATH_PROG(SH,sh)
@ -116,7 +118,7 @@ AC_SUBST(PERL, $with_perl)
 dnl openssl/gnutls
 AC_ARG_WITH(openssl,
-            AC_HELP_STRING([--with-openssl=DIR], 
+            AC_HELP_STRING([--with-openssl=DIR],
                           [path to openssl installation]),)
 AC_ARG_WITH(gnutls,
@ -154,23 +156,41 @@ AC_CHECK_HEADERS(math.h)
 AC_CHECK_LIB(m,floor,MATHLIBS="-lm")
 AC_SUBST(MATHLIBS)
-dnl Check for libtap, to run perl-like tests
+dnl Check if we buils local libtap
-AC_CHECK_LIB(tap, plan_tests, 
+AC_ARG_ENABLE(libtap,
  AC_HELP_STRING([--enable-libtap],
 		[Enable built-in libtap for unit-testing (default: autodetect system library).]),
 	[enable_libtap=$enableval],
 	[enable_libtap=no])
 AM_CONDITIONAL([USE_LIBTAP_LOCAL],[test "$enable_libtap" = "yes"])
 # If not local, check if we can use the system one
 if test "$enable_libtap" != "yes" ; then
 	dnl Check for libtap, to run perl-like tests
 	AC_CHECK_LIB(tap, plan_tests,
 		enable_libtap="yes"
 		)
 fi
 # Finally, define tests if we use libtap
 if test "$enable_libtap" = "yes" ; then
 	EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
 	AC_SUBST(EXTRA_TEST)
-	)
+fi
 dnl INI Parsing
 AC_ARG_ENABLE(extra-opts,
-  AC_HELP_STRING([--enable-extra-opts], 
+  AC_HELP_STRING([--enable-extra-opts],
 		[Enables parsing of plugins ini config files for extra options (default: no)]),
 	[enable_extra_opts=$enableval],
 	[enable_extra_opts=no])
 AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
 if test "$enable_extra_opts" = "yes" ; then
 	EXTRA_TEST="$EXTRA_TEST test_ini test_opts"
 	AC_SUBST(EXTRA_TEST)
 	AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
 	if test "$enable_libtap" = "yes"; then
 		EXTRA_TEST="$EXTRA_TEST test_ini1 test_ini3 test_opts1 test_opts2 test_opts3"
 		AC_SUBST(EXTRA_TEST)
 	fi
 fi
 dnl Check for PostgreSQL libraries
@ -270,8 +290,8 @@ fi
 if test "$FOUNDINCLUDE" = "yes" ; then
 	EXTRAS="$EXTRAS check_ide_smart"
 else
-	AC_MSG_WARN([Skipping check_ide_smart plugin.]) 
+	AC_MSG_WARN([Skipping check_ide_smart plugin.])
-	AC_MSG_WARN([check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h.]) 
+	AC_MSG_WARN([check_ide_smart is linux specific. It requires linux/hdreg.h and linux/types.h.])
 fi
 dnl Check for mysql libraries
@ -456,7 +476,6 @@ AC_STRUCT_TM
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_SIGNAL
 AC_TYPE_MBSTATE_T
 AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[
 AC_TRY_LINK([#include <stdarg.h>
@ -465,7 +484,7 @@ ac_cv_HAVE_VA_COPY=yes,
 ac_cv_HAVE_VA_COPY=no)])
 if test x"$ac_cv_HAVE_VA_COPY" = x"yes"; then
    AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
-else    
+else
    AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE___VA_COPY,[
    AC_TRY_LINK([#include <stdarg.h>
    va_list ap1,ap2;], [__va_copy(ap1,ap2);],
@ -511,7 +530,7 @@ AC_PATH_PROG(PATH_TO_PS,ps)
 AC_MSG_CHECKING(for ps syntax)
 AC_ARG_WITH(ps_command,
-            ACX_HELP_STRING([--with-ps-command=PATH], 
+            ACX_HELP_STRING([--with-ps-command=PATH],
                            [Verbatim command to execute for ps]),
            PS_COMMAND=$withval)
 AC_ARG_WITH(ps_format,
@ -519,7 +538,7 @@ AC_ARG_WITH(ps_format,
                            [Format string for scanning ps output]),
            PS_FORMAT=$withval)
 AC_ARG_WITH(ps_cols,
-            ACX_HELP_STRING([--with-ps-cols=NUM], 
+            ACX_HELP_STRING([--with-ps-cols=NUM],
                            [Number of columns in ps command]),
            PS_COLS=$withval)
 AC_ARG_WITH(ps_varlist,
@ -527,7 +546,7 @@ AC_ARG_WITH(ps_varlist,
                            [Variable list for sscanf of 'ps' output]),
            PS_VARLIST=$withval)
-if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -n "$PS_VARLIST"; then 
+if test -n "$PS_COMMAND" && test -n "$PS_FORMAT" && test -n "$PS_COLS" && test -n "$PS_VARLIST"; then
 	ac_cv_ps_command="$PS_COMMAND"
 	ac_cv_ps_format="$PS_FORMAT"
 	ac_cv_ps_varlist="$PS_VARLIST"
@ -601,7 +620,7 @@ then
 	ac_cv_ps_cols=9
 	AC_MSG_RESULT([$ac_cv_ps_command])
-dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4. 
+dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
 dnl Limitation: Only first 16 chars returned for ucomm field
 dnl Must come before ps -weo
 elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
@ -678,9 +697,9 @@ then
 	ac_cv_ps_cols=9
 	AC_MSG_RESULT([$ac_cv_ps_command])
-dnl Tru64 - needs %*[ +<>] in PS_FORMAT. 
+dnl Tru64 - needs %*[ +<>] in PS_FORMAT.
 dnl Has /usr/bin/ps and /sbin/ps - force sbin version
-dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead 
+dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
 dnl of 1500). Will need big changes to check_procs to support
 elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \
 	egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
@ -806,7 +825,7 @@ then
 	ac_cv_ps_cols=8
 	AC_MSG_RESULT([$ac_cv_ps_command])
-dnl UnixWare 
+dnl UnixWare
 elif ps -Al 2>/dev/null | \
 	egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
 then
@ -1171,7 +1190,7 @@ fi
 AC_PATH_PROG(PATH_TO_SMBCLIENT,smbclient)
 AC_ARG_WITH(smbclient_command,
            ACX_HELP_STRING([--with-smbclient-command=PATH],
-                            [sets path to smbclient]), 
+                            [sets path to smbclient]),
            PATH_TO_SMBCLIENT=$withval)
 if test -n "$PATH_TO_SMBCLIENT"
 then
@ -1227,7 +1246,7 @@ fi
 AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
 AC_PATH_PROG(PATH_TO_QSTAT,qstat)
 AC_ARG_WITH(qstat_command,
-            ACX_HELP_STRING([--with-qstat-command=PATH], 
+            ACX_HELP_STRING([--with-qstat-command=PATH],
                            [Path to qstat command]), PATH_TO_QSTAT=$withval)
 if test -x "$PATH_TO_QUAKESTAT"
@ -1243,7 +1262,7 @@ else
 	AC_MSG_WARN([Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin])
 fi
-if test $ac_cv_path_to_qstat 
+if test $ac_cv_path_to_qstat
 then
 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
 		[path to qstat/quakestat])
@ -1402,12 +1421,12 @@ AC_CHECK_MEMBERS([struct swapent.se_nblks],,,[
               #include <sys/swap.h>
               ])
-if test "$ac_cv_have_decl_swapctl" = "yes"; 
+if test "$ac_cv_have_decl_swapctl" = "yes";
 then
 	EXTRAS="$EXTRAS check_swap"
 	AC_MSG_CHECKING([for 2-arg (SVR4) swapctl])
 	if test "$ac_cv_type_swaptbl_t" = "yes" -a \
-	        "$ac_cv_type_swapent_t" = "yes"; 
+	        "$ac_cv_type_swapent_t" = "yes";
 	then
 		AC_MSG_RESULT([yes])
 		ac_cv_check_swap_swapctl_svr4="1";
@ -1416,7 +1435,7 @@ then
 	else
 		AC_MSG_RESULT([no])
 		AC_MSG_CHECKING([for 3-arg (*BSD) swapctl])
-		if test "$ac_cv_member_struct_swapent_se_nblks" = "yes"; 
+		if test "$ac_cv_member_struct_swapent_se_nblks" = "yes";
 		then
 			AC_MSG_RESULT([yes])
 			AC_DEFINE([CHECK_SWAP_SWAPCTL_BSD],1,
@ -1457,12 +1476,12 @@ dnl end tests for the swapctl system calls
 dnl
-if test "x$ac_cv_have_swap" != "x" 
+if test "x$ac_cv_have_swap" != "x"
 then
 	AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found])
 	EXTRAS="$EXTRAS check_swap"
 fi
-if test "x$ac_cv_swap_command" != "x" 
+if test "x$ac_cv_swap_command" != "x"
 then
 	AC_DEFINE_UNQUOTED(SWAP_COMMAND,"$ac_cv_swap_command",
 		[Path to swap/swapinfo binary, with any args])
@ -1507,7 +1526,7 @@ fi
 AC_PATH_PROG(PATH_TO_APTGET,apt-get)
 AC_ARG_WITH(apt-get_command,
            ACX_HELP_STRING([--with-apt-get-command=PATH],
-                            [Path to apt-get command]), 
+                            [Path to apt-get command]),
                            with_apt_get_command=$withval,
                            with_apt_get_command=$PATH_TO_APTGET)
 AC_DEFINE_UNQUOTED(PATH_TO_APTGET,"$PATH_TO_APTGET",[Path to apt-get command, if present])
@ -1536,7 +1555,7 @@ case $host in
 	*sun* | *solaris*)
 		AC_DEFINE(__sun__,1,[sun specific code in check_dhcp.c])
 	;;
-	*hpux*)  
+	*hpux*)
 		AC_DEFINE(__hpux__,1,[hpux specific code in check_dhcp.c])
 	;;
 esac
@ -1556,8 +1575,8 @@ dnl 2.6.9-11 (okay in 2.6.9-5). Redhat investigating root cause
 dnl We patch plugins/popen.c
 dnl Need to add smp because uname different on those
 dnl Can force patch to be applied with --enable-redhat-pthread-workaround
-AC_ARG_ENABLE(redhat-pthread-workaround, 
+AC_ARG_ENABLE(redhat-pthread-workaround,
-	AC_HELP_STRING([--enable-redhat-pthread-workaround], 
+	AC_HELP_STRING([--enable-redhat-pthread-workaround],
 		[force Redhat patch to be applied (default: test system)]),
 	[ac_cv_enable_redhat_pthread_workaround=$enableval],
 	[ac_cv_enable_redhat_pthread_workaround=test])
@ -1579,7 +1598,7 @@ fi
 dnl Perl modules
 AC_ARG_ENABLE(perl-modules,
-	AC_HELP_STRING([--enable-perl-modules], 
+	AC_HELP_STRING([--enable-perl-modules],
 		[Enables installation of Nagios::Plugin and its dependencies (default: no)]),
 	[enable_perl_modules=$enableval],
 	[enable_perl_modules=no])
@ -1587,6 +1606,18 @@ if test "$enable_perl_modules" = "yes" ; then
  AC_SUBST(PERLMODS_DIR,perlmods)
 fi
 # From Tap configure
 # Checks for libraries
 case "$host" in
 	*-*-*freebsd4*)
 		LDFLAGS="$LDFLAGS -pthread"
 		HAVE_LIBPTHREAD=1
 		;;
 	*)
 		AC_CHECK_LIB(pthread, main)
 		;;
 esac
 dnl External libraries - see ACKNOWLEDGEMENTS
 gl_INIT
@ -1596,24 +1627,25 @@ if test "$ac_cv_uname_s" = 'SunOS' -a \( "x$ac_cv_prog_ac_ct_AR" = "x" -o "$ac_c
 fi
 AC_OUTPUT(
-  Makefile 
+  Makefile
-  lib/Makefile 
+  tap/Makefile
-  plugins/Makefile 
+  lib/Makefile
  plugins/Makefile
  lib/tests/Makefile
  plugins-root/Makefile
-  plugins-scripts/Makefile 
+  plugins-scripts/Makefile
-  plugins-scripts/subst 
+  plugins-scripts/subst
-  plugins-scripts/utils.pm 
+  plugins-scripts/utils.pm
-  plugins-scripts/utils.sh 
+  plugins-scripts/utils.sh
  perlmods/Makefile
-  command.cfg 
+  command.cfg
-  test.pl 
+  test.pl
-  pkg/solaris/pkginfo 
+  pkg/solaris/pkginfo
-  po/Makefile.in 
+  po/Makefile.in
 )
-dnl the ones below that are commented out need to be cleaned up 
+dnl the ones below that are commented out need to be cleaned up
 dnl in the configure code above to use with_foo instead of ac_cv_foo
 dnl if we want them to show up here.  it'd also make the code cleaner.
 dnl i'll get to that on another rainy day :) -sf
@ -1647,5 +1679,5 @@ ACX_FEATURE([with],[perl])
 ACX_FEATURE([enable],[perl-modules])
 ACX_FEATURE([with],[cgiurl])
 ACX_FEATURE([with],[trusted-path])
-
+ACX_FEATURE([enable],[libtap])
--- a/contrib/check_adptraid.sh
+++ b/contrib/check_adptraid.sh
@ -13,7 +13,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision: 302 $' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 2091 $' | sed -e 's/[^0-9.]//g'`
 . $PROGPATH/utils.sh
--- a/contrib/check_apc_ups.pl
+++ b/contrib/check_apc_ups.pl
@ -38,7 +38,7 @@ GetOptions
 	 "H=s" => \$opt_H, "hostname=s"		=> \$opt_H);
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 1771 $');
+	print_revision($PROGNAME,'$Revision: 2091 $');
 	exit $ERRORS{'OK'};
 }
@ -252,7 +252,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 1771 $');
+	print_revision($PROGNAME,'$Revision: 2091 $');
 	print "Copyright (c) 2001 Gerald Combs/Jeffrey Blank/Karl DeBisschop
 This plugin reports the status of an APC UPS equipped with an SNMP management
--- a/contrib/check_appletalk.pl
+++ b/contrib/check_appletalk.pl
@ -9,7 +9,7 @@
 # using "aecho"
 #
 # initial version: 23 October 2002 by Stefan Beck, IT Software Solutions
-# current status: $Revision: 1771 $
+# current status: $Revision: 2091 $
 #
 # Copyright Notice: GPL
 #
@ -122,7 +122,7 @@ while (<CMD>) {
 }
 sub print_help() {
-     print_revision( $PROGNAME, '$Revision: 1771 $ ' );
+     print_revision( $PROGNAME, '$Revision: 2091 $ ' );
     print "Copyright (c) 2002 Stefan Beck\n";
     print "\n";
     print "Check if an atalkhost responds to an atalk echo using\n";
@ -159,7 +159,7 @@ sub print_usage () {
 }
 sub version () {
-     print_revision( $PROGNAME, '$Revision: 1771 $ ' );
+     print_revision( $PROGNAME, '$Revision: 2091 $ ' );
     exit $ERRORS{'OK'};
 }
--- a/contrib/check_arping.pl
+++ b/contrib/check_arping.pl
@ -55,7 +55,7 @@ if ($status == 0)
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 1112 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	exit $ERRORS{'OK'};
 }
@ -115,6 +115,6 @@ sub print_help {
 	print "   -t (--timeout)    Timeout in seconds.\n";
 	print "   -V (--version)    Plugin version\n";
 	print "   -h (--help)       usage help \n\n";
-	print_revision($PROGNAME, '$Revision: 1112 $');
+	print_revision($PROGNAME, '$Revision: 2091 $');
 }
--- a/contrib/check_email_loop.pl
+++ b/contrib/check_email_loop.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: check_email_loop.pl 1290 2005-11-29 23:21:06Z harpermann $
+# $Id: check_email_loop.pl 2091 2008-11-23 05:38:47Z dermoth $
 #
 # (c)2000 Benjamin Schmid, blueshift@gmx.net (emergency use only ;-)
 # Copyleft by GNU GPL
--- a/contrib/check_fan_cpq_present
+++ b/contrib/check_fan_cpq_present
@ -111,7 +111,7 @@ sub print_usage () {
 	}
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 1113 $\n ');
+	print_revision($PROGNAME,'$Revision: 2091 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@ -122,7 +122,7 @@ sub print_help () {
 	}
 sub version () {
-        print_revision($PROGNAME,'$Revision: 1113 $ ');
+        print_revision($PROGNAME,'$Revision: 2091 $ ');
        exit $ERRORS{'OK'};
 }
--- a/contrib/check_fan_fsc_present
+++ b/contrib/check_fan_fsc_present
@ -113,7 +113,7 @@ sub print_usage () {
 	}
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 1113 $\n ');
+	print_revision($PROGNAME,'$Revision: 2091 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@ -124,7 +124,7 @@ sub print_help () {
 	}
 sub version () {
-        print_revision($PROGNAME,'$Revision: 1113 $ ');
+        print_revision($PROGNAME,'$Revision: 2091 $ ');
        exit $ERRORS{'OK'};
 }
--- a/contrib/check_frontpage
+++ b/contrib/check_frontpage
@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 #
-# $Id: check_frontpage 1112 2005-01-27 04:46:08Z stanleyhopcroft $
+# $Id: check_frontpage 2091 2008-11-23 05:38:47Z dermoth $
 #
 # Check that FrontPage extensions appear to be working on a specified host.
 # Currently only checks that the hit counter is not returning an error.
@ -42,7 +42,7 @@ GetOptions
 	 "H=s" => \$opt_H, "hostname=s" => \$opt_H);
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 1112 $'); #'
+	print_revision($PROGNAME,'$Revision: 2091 $'); #'
 	exit $ERRORS{'OK'};
 }
@ -139,7 +139,7 @@ sub print_usage () {
 }
 sub print_help () {
-   print_revision($PROGNAME,'$Revision: 1112 $');
+   print_revision($PROGNAME,'$Revision: 2091 $');
   print "Copyright (c) 2003 Kev Green\n";
   print "\n";
   print "FrontPage remains a copyright/trademark of Microsoft Corporation.\n";
--- a/contrib/check_http-with-client-certificate.c
+++ b/contrib/check_http-with-client-certificate.c
@ -37,7 +37,7 @@
 *****************************************************************************/
 const char *progname = "check_http";
-#define REVISION "$Revision: 1117 $"
+#define REVISION "$Revision: 2091 $"
 #define CVSREVISION "1.24"
 #define COPYRIGHT "2003"
 #define AUTHORS "Fabian Pehla"
--- a/contrib/check_hw.sh
+++ b/contrib/check_hw.sh
@ -16,7 +16,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision: 939 $' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 2091 $' | sed -e 's/[^0-9.]//g'`
 . $PROGPATH/utils.sh
--- a/contrib/check_ica_master_browser.pl
+++ b/contrib/check_ica_master_browser.pl
@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
-# $Id: check_ica_master_browser.pl 1099 2005-01-25 09:09:33Z stanleyhopcroft $
+# $Id: check_ica_master_browser.pl 2091 2008-11-23 05:38:47Z dermoth $
 # $Log$
 # Revision 1.1  2005/01/25 09:09:33  stanleyhopcroft
 # New plugin - checks that ICA master browser is what it should be (important for firewalled dialup)
 #
@ -170,7 +169,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 1099 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
 Perl Check Citrix Master Browser plugin for Nagios.
@ -218,7 +217,7 @@ The ICA Client requests the address of the ICA master browser from the Citrix se
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 1099 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_ica_metaframe_pub_apps.pl
+++ b/contrib/check_ica_metaframe_pub_apps.pl
@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
-# $Id: check_ica_metaframe_pub_apps.pl 1098 2005-01-25 09:07:39Z stanleyhopcroft $
+# $Id: check_ica_metaframe_pub_apps.pl 2091 2008-11-23 05:38:47Z dermoth $
 # $Log$
 # Revision 1.1  2005/01/25 09:07:39  stanleyhopcroft
 # Replacement (structured name mainly) for check_citrix: check of ICA browse service
 #
@ -303,7 +302,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 1098 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	print "Copyright (c) 2002 Ed Rolison/Tom De Blende/S Hopcroft
 Perl Check Citrix plugin for Nagios.
@ -350,7 +349,7 @@ The plugin works by
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 1098 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_ica_program_neigbourhood.pl
+++ b/contrib/check_ica_program_neigbourhood.pl
@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
-# $Id: check_ica_program_neigbourhood.pl 1097 2005-01-25 09:05:53Z stanleyhopcroft $
+# $Id: check_ica_program_neigbourhood.pl 2091 2008-11-23 05:38:47Z dermoth $
 # $Log$
 # Revision 1.1  2005/01/25 09:05:53  stanleyhopcroft
 # New plugin to check Citrix Metaframe XP "Program Neighbourhood"
 #
@ -290,7 +289,7 @@ sub print_help() {
 #          1        2         3         4         5         6         7         8
 #12345678901234567890123456789012345678901234567890123456789012345678901234567890
-	print_revision($PROGNAME,'$Revision: 1097 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 my $help = <<EOHELP ;
 Copyright (c) 2004 Karl DeBisschop/S Hopcroft
@ -345,7 +344,7 @@ sub usage {
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 1097 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_inodes-freebsd.pl
+++ b/contrib/check_inodes-freebsd.pl
@ -41,7 +41,7 @@ GetOptions
 if ($opt_V) {
-        print_revision($PROGNAME,'$Revision: 72 $ ');
+        print_revision($PROGNAME,'$Revision: 2091 $ ');
        exit $ERRORS{'OK'};
 }
@ -114,7 +114,7 @@ sub print_usage () {
 }
 sub print_help () {
-        print_revision($PROGNAME,'$Revision: 72 $');
+        print_revision($PROGNAME,'$Revision: 2091 $');
        print "Copyright (c) 2002 Andrew Ryder\n";
        print "\n";
        print_usage();
--- a/contrib/check_javaproc.pl
+++ b/contrib/check_javaproc.pl
@ -170,7 +170,7 @@ Perl Check java processes plugin for Nagios
 }
 sub revision() {
-	print_revision($PROGNAME,'$Revision: 211 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 }
 sub version () {
--- a/contrib/check_joy.sh
+++ b/contrib/check_joy.sh
@ -4,7 +4,7 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision: 2 $' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 2091 $' | sed -e 's/[^0-9.]//g'`
 STATUS=""
 . $PROGPATH/utils.sh
--- a/contrib/check_log2.pl
+++ b/contrib/check_log2.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: check_log2.pl 1300 2005-12-16 18:41:45Z harpermann $
+# $Id: check_log2.pl 2091 2008-11-23 05:38:47Z dermoth $
 #
 # Log file regular expression detector for Nagios.
 # Written by Aaron Bostick (abostick@mydoconline.com)
@ -77,7 +77,7 @@ sub print_help ();
    $neg_re_pattern = '';
    $pattern_count = 0;
    $pattern_line = '';
-    $plugin_revision = '$Revision: 1300 $ ';
+    $plugin_revision = '$Revision: 2091 $ ';
    # Grab options from command line
    GetOptions
--- a/contrib/check_lotus.pl
+++ b/contrib/check_lotus.pl
@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
-# $Id: check_lotus.pl 1096 2005-01-25 09:04:26Z stanleyhopcroft $
+# $Id: check_lotus.pl 2091 2008-11-23 05:38:47Z dermoth $
 # $Log$
 # Revision 1.1  2005/01/25 09:04:26  stanleyhopcroft
 # New plugin to check responsiveness of Louts Notes (v5 at least) servers
 #
@ -219,7 +218,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 1096 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	print "Copyright (c) 2004 Ed Rolison/S Hopcroft
 Perl Check Lotus Notes plugin for Nagios.
@ -250,7 +249,7 @@ Returns OK if the named server responds with its name.
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 1096 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_mem.pl
+++ b/contrib/check_mem.pl
@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# $Id: check_mem.pl 2 2002-02-28 06:42:51Z egalstad $
+# $Id: check_mem.pl 2091 2008-11-23 05:38:47Z dermoth $
 # check_mem.pl Copyright (C) 2000 Dan Larsson <dl@tyfon.net>
 #
--- a/contrib/check_ms_spooler.pl
+++ b/contrib/check_ms_spooler.pl
@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
-# $Id: check_ms_spooler.pl 64 2002-07-16 00:04:42Z stanleyhopcroft $
+# $Id: check_ms_spooler.pl 2091 2008-11-23 05:38:47Z dermoth $
 # $Log$
 # Revision 1.1  2002/07/16 00:04:42  stanleyhopcroft
 # Primitive and in need of refinement test of MS spooler (with smbclient)
 #
@ -268,7 +267,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 64 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
 Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an SMB (Samba or MS) print spooler.
@ -292,7 +291,7 @@ Perl Check MS Spooler plugin for NetSaint. Display a subset of the queues on an
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 64 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/check_ora_table_space.pl
+++ b/contrib/check_ora_table_space.pl
@ -4,8 +4,8 @@
 # Written by: Erwan Arzur (erwan@netvalue.com)
 # License: GPL
 #
-# Last Modified: $Date: 2002-02-28 06:42:51 +0000 (Thu, 28 Feb 2002) $
+# Last Modified: $Date: 2008-11-23 05:38:47 +0000 (Sun, 23 Nov 2008) $
-# Revisiin: $Revision: 2 $
+# Revisiin: $Revision: 2091 $
 #
 # "check_ora_table_space.pl" plugin to check the state of Oracle 
 # table spaces. Scarce documentation.
--- a/contrib/check_oracle_instance.pl
+++ b/contrib/check_oracle_instance.pl
@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: check_oracle_instance.pl 10 2002-04-03 02:58:47Z sghosh $
+# $Id: check_oracle_instance.pl 2091 2008-11-23 05:38:47Z dermoth $
 #  Copyright (c) 2002  Sven Dolderer
 #  some pieces of Code adopted from Adam vonNieda's oracletool.pl
@ -23,7 +23,7 @@ require DBD::Oracle || die "It appears that the DBD::Oracle module is not instal
 use vars qw($VERSION $PROGNAME $logfile $debug $state $dbh $database $username $password $message $sql $cursor $opt_asession $opt_nsession $opt_tablespace $opt_nextents $opt_fextents $opt_aextents $privsok $warn $critical);
-'$Revision: 10 $' =~ /^.*(\d+.\d+) \$$/;  # Use The Revision from RCS/CVS
+'$Revision: 2091 $' =~ /^.*(\d+.\d+) \$$/;  # Use The Revision from RCS/CVS
 $VERSION = $1;
 $0 =~ m!^.*/([^/]+)$!;
 $PROGNAME = $1;
--- a/contrib/check_oracle_tbs
+++ b/contrib/check_oracle_tbs
@ -30,7 +30,7 @@ if (!$ENV{ORACLE_HOME}) {
 my $state = $ERRORS{'UNKNOWN'};
 my $answer = undef;
-my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision: 1134 $ =~ /(\d+)\.(\d+)/;
+my ($MAJOR_VERSION, $MINOR_VERSION) = q$Revision: 2091 $ =~ /(\d+)\.(\d+)/;
 my $VERSION = sprintf("%d.%02d", $MAJOR_VERSION - 1, $MINOR_VERSION);
 my $opt_debug;                  # -d|--debug
--- a/contrib/check_pfstate
+++ b/contrib/check_pfstate
@ -27,7 +27,7 @@ GetOptions
 	 "c=s" => \$opt_c, "critical=s"	=> \$opt_c);
 if ($opt_V) {
-        print_revision($PROGNAME,'$Revision: 1112 $');
+        print_revision($PROGNAME,'$Revision: 2091 $');
        exit $ERRORS{'OK'};
 }
 if ($opt_h) {
@ -67,7 +67,7 @@ exit $ERRORS{'OK'};
 sub print_help {
-        print_revision($PROGNAME,'$Revision: 1112 $');
+        print_revision($PROGNAME,'$Revision: 2091 $');
        print "Copyright (c) 2002 Jason Dixon\n\nThis plugin checks the number of state table entries on a PF-enabled OpenBSD system.\n\n";
        print "Usage:\t-H, --hostname=<HOST> [-w, --warning=<WARNING>] [-c, --critical=<CRITICAL>]\n\n\tDefault warning is 50000 and critical is 60000.\n\n";
        support();
--- a/contrib/check_rbl.c
+++ b/contrib/check_rbl.c
@ -11,7 +11,7 @@
 * * License: GPL
 * * Copyright (c) 2000
 * * 
-* * $Id: check_rbl.c 970 2004-12-02 00:30:32Z opensides $
+* * $Id: check_rbl.c 2091 2008-11-23 05:38:47Z dermoth $
 *
 *****************************************************************************/
@ -22,7 +22,7 @@
 #include "string.h"
 const char progname = "check_rbl";
-const char *revision = "$Revision: 970 $";
+const char *revision = "$Revision: 2091 $";
 //const char *copyright = "2000-2003";
 //const char *email = "nagiosplug-devel@lists.sourceforge.net";
@ -263,7 +263,7 @@ int call_getopt(int argc, char **argv)
 				}
 				break;
      case 'V': /* version */
-				print_revision(progname,"$Revision: 970 $");
+				print_revision(progname,"$Revision: 2091 $");
 				exit(STATE_OK);
      case 'h': /* help */
 				print_help();
@ -291,7 +291,7 @@ int validate_arguments(void)
 void print_help(void)
 {
-	print_revision(progname,"$Revision: 970 $");
+	print_revision(progname,"$Revision: 2091 $");
 	printf
 		("Copyright (c) 2000 Karl DeBisschop\n\n"
 		 "This plugin uses dig to test whether the specified host is on any RBL lists.\n\n");
--- a/contrib/check_smb.sh
+++ b/contrib/check_smb.sh
@ -26,7 +26,7 @@
 #
 PROGNAME=`basename $0`
 PROGPATH=`echo $0 | /bin/sed -e 's,[\\/][^\\/][^\\/]*$,,'`
-REVISION=`echo '$Revision: 71 $' | sed -e 's/[^0-9.]//g'`
+REVISION=`echo '$Revision: 2091 $' | sed -e 's/[^0-9.]//g'`
 . $PROGPATH/utils.sh
--- a/contrib/check_snmp_disk_monitor.pl
+++ b/contrib/check_snmp_disk_monitor.pl
@ -52,7 +52,7 @@ sub process_options {
 }
 sub local_print_revision {
-        print_revision( $PROGNAME, '$Revision: 82 $ ' )
+        print_revision( $PROGNAME, '$Revision: 2091 $ ' )
 }
 sub print_usage {
--- a/contrib/check_snmp_printer.pl
+++ b/contrib/check_snmp_printer.pl
@ -116,7 +116,7 @@ GetOptions
 $PROGNAME = "check_snmp_printer";
 if ($opt_V) {
-	print_revision($PROGNAME,'$Revision: 795 $');
+	print_revision($PROGNAME,'$Revision: 2091 $');
 	exit $ERRORS{'OK'};
 }
@ -572,7 +572,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 795 $');
+	print_revision($PROGNAME,'$Revision: 2091 $');
 	print "Copyright (c) 2002 Subhendu Ghosh/Ethan Galstad.
 This plugin reports the status of an network printer with an SNMP management
--- a/contrib/check_snmp_process_monitor.pl
+++ b/contrib/check_snmp_process_monitor.pl
@ -91,7 +91,7 @@ sub process_options {
 }
 sub local_print_revision {
-        print_revision( $PROGNAME, '$Revision: 84 $ ' )
+        print_revision( $PROGNAME, '$Revision: 2091 $ ' )
 }
 sub print_usage {
--- a/contrib/check_snmp_procs.pl
+++ b/contrib/check_snmp_procs.pl
@ -109,7 +109,7 @@ if (GetOptions(
 }
 if ($opt_version) {
-	print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
+	print_revision($PROGNAME, "\$Revision: 2091 $REVISION \$");
 	exit $ERRORS{'OK'};
 }
@ -529,7 +529,7 @@ sub print_usage {
 #
 sub print_help {
-	print_revision($PROGNAME, "\$Revision: 1771 $REVISION \$");
+	print_revision($PROGNAME, "\$Revision: 2091 $REVISION \$");
 	print "Copyright (c) 2003 David Alden
 Check if processes are running on a host via snmp
--- a/contrib/check_temp_cpq
+++ b/contrib/check_temp_cpq
@ -138,7 +138,7 @@ sub print_usage () {
 	}
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 1113 $\n ');
+	print_revision($PROGNAME,'$Revision: 2091 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@ -151,7 +151,7 @@ sub print_help () {
 	}
 sub version () {
-        print_revision($PROGNAME,'$Revision: 1113 $ ');
+        print_revision($PROGNAME,'$Revision: 2091 $ ');
        exit $ERRORS{'OK'};
 }
--- a/contrib/check_temp_fsc
+++ b/contrib/check_temp_fsc
@ -138,7 +138,7 @@ sub print_usage () {
 	}
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 1113 $\n ');
+	print_revision($PROGNAME,'$Revision: 2091 $\n ');
 	print "Copyright (c) 2003 Rainer Duffner\n ";
 	print_usage();
 	print "\n";
@ -149,7 +149,7 @@ sub print_help () {
 	}
 sub version () {
-        print_revision($PROGNAME,'$Revision: 1113 $ ');
+        print_revision($PROGNAME,'$Revision: 2091 $ ');
        exit $ERRORS{'OK'};
 }
--- a/contrib/check_traceroute.pl
+++ b/contrib/check_traceroute.pl
@ -1,8 +1,7 @@
 #!/usr/bin/perl
-# $Id: check_traceroute.pl 1115 2005-01-27 10:34:16Z stanleyhopcroft $
+# $Id: check_traceroute.pl 2091 2008-11-23 05:38:47Z dermoth $
 # $Log$
 # Revision 1.1  2005/01/27 10:34:16  stanleyhopcroft
 # Jon Meek's check_traceroute for Mon hacked by YT for Nagios. Prob pretty weak
 #
@ -32,7 +31,7 @@ getopts('i:H:N:R:T:dhrvV');
 do { print_help ; exit $ERRORS{OK}; }
 	if $opt_h ;
-do { print_revision($PROGNAME, '$Revision: 1115 $'); exit $ERRORS{OK}; }
+do { print_revision($PROGNAME, '$Revision: 2091 $'); exit $ERRORS{OK}; }
 	if $opt_V ;
 do { print_help; exit $ERRORS{OK}; }
@ -176,7 +175,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME, '$Revision: 1115 $') ;
+	print_revision($PROGNAME, '$Revision: 2091 $') ;
 	print "Copyright (c) 2004 J Meek/Karl DeBisschop
 This plugin checks whether traceroute to the destination succeeds and if so that the route string option (-R) matches the list of routers
--- a/contrib/check_uptime.c
+++ b/contrib/check_uptime.c
@ -9,7 +9,7 @@
 * Based on CHECK_LOAD.C
 * Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>
 *
- * Last Modified: $Date: 2002-03-01 02:42:56 +0000 (Fri, 01 Mar 2002) $
+ * Last Modified: $Date: 2008-11-23 05:38:47 +0000 (Sun, 23 Nov 2008) $
 *
 * Command line: CHECK_UPTIME <host_address>
 * 
@ -44,7 +44,7 @@ int main(int argc, char **argv)
  if(argc != 2){
    printf("Incorrect number of arguments supplied\n");
    printf("\n");
-    print_revision(argv[0],"$Revision: 6 $");
+    print_revision(argv[0],"$Revision: 2091 $");
    printf("Copyright (c) 2000 Teresa Ramanan (tlr@redowl.org)\n");
    printf("\n");
    printf("Usage: %s <host_address>\n",argv[0]);
--- a/contrib/check_vcs.pl
+++ b/contrib/check_vcs.pl
@ -71,7 +71,7 @@ sub print_help ();
    $vcs_negate = '';
    $vcs_result = '';
    $vcs_expected_result = 'ONLINE';
-    $plugin_revision = '$Revision: 33 $ ';
+    $plugin_revision = '$Revision: 2091 $ ';
    # Grab options from command line
    GetOptions
--- a/contrib/check_wins.pl
+++ b/contrib/check_wins.pl
@ -1,8 +1,7 @@
 #!/usr/bin/perl -w
-# $Id: check_wins.pl 940 2004-11-25 04:46:16Z stanleyhopcroft $
+# $Id: check_wins.pl 2091 2008-11-23 05:38:47Z dermoth $
 # $Log$
 # Revision 1.3  2004/11/25 04:46:16  stanleyhopcroft
 # Non functional tidy ups to check_wins
 #
@ -190,7 +189,7 @@ sub print_usage () {
 }
 sub print_help () {
-	print_revision($PROGNAME,'$Revision: 940 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	print "Copyright (c) 2001 Karl DeBisschop/S Hopcroft
 Perl Check WINS plugin for NetSaint.
@ -237,7 +236,7 @@ The plugin works by
 }
 sub version () {
-	print_revision($PROGNAME,'$Revision: 940 $ ');
+	print_revision($PROGNAME,'$Revision: 2091 $ ');
 	exit $ERRORS{'OK'};
 }
--- a/contrib/packet_utils.pm
+++ b/contrib/packet_utils.pm
@ -1,8 +1,7 @@
 package packet_utils;
-# $Id: packet_utils.pm 1100 2005-01-25 09:12:47Z stanleyhopcroft $
+# $Id: packet_utils.pm 2091 2008-11-23 05:38:47Z dermoth $
 # $Log$
 # Revision 1.1  2005/01/25 09:12:47  stanleyhopcroft
 # packet creation and dumping hacks used by check_ica* and check_lotus
 #
--- a/contrib/utils.py
+++ b/contrib/utils.py
@ -8,7 +8,7 @@
 #==========================================================================
 #
-# Version: = '$Id: utils.py 2 2002-02-28 06:42:51Z egalstad $'
+# Version: = '$Id: utils.py 2091 2008-11-23 05:38:47Z dermoth $'
 #
 # (C) Rob W.W. Hooft, Nonius BV, 1998
 #
--- 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) 2004-2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
@ -9,10 +9,11 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --no-libtool --macro-prefix=gl base64 dirname floorf fsusage getaddrinfo gethostname getloadavg getopt gettext mountlist regex vasprintf vsnprintf
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl base64 dirname floorf fsusage getaddrinfo gethostname getloadavg getopt gettext mountlist regex timegm vasprintf vsnprintf
 AUTOMAKE_OPTIONS = 1.5 gnits
 SUBDIRS =
 noinst_HEADERS =
 noinst_LIBRARIES =
 noinst_LTLIBRARIES =
@ -24,8 +25,10 @@ MOSTLYCLEANDIRS =
 CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 EXTRA_DIST += m4/gnulib-cache.m4
 AM_CPPFLAGS =
 AM_CFLAGS =
 noinst_LIBRARIES += libgnu.a
@ -34,14 +37,12 @@ libgnu_a_LIBADD = $(gl_LIBOBJS)
 libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
 EXTRA_libgnu_a_SOURCES =
-## begin gnulib module absolute-header
+## begin gnulib module alignof
 # Use this preprocessor expression to decide whether #include_next works.
 # Do not rely on a 'configure'-time test for this, since the expression
 # might appear in an installed header, which is used by some other compiler.
 HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
-## end   gnulib module absolute-header
+EXTRA_DIST += alignof.h
 ## end   gnulib module alignof
 ## begin gnulib module alloca
@ -77,16 +78,27 @@ BUILT_SOURCES += $(ARPA_INET_H)
 # We need the following in order to create <arpa/inet.h> when the system
 # doesn't have one.
-arpa/inet.h:
+arpa/inet.h: arpa_inet.in.h
 	@MKDIR_P@ arpa
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  echo '#include <sys/socket.h>'; \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \
 	      -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \
 	      -e 's|@''GNULIB_INET_NTOP''@|$(GNULIB_INET_NTOP)|g' \
 	      -e 's|@''GNULIB_INET_PTON''@|$(GNULIB_INET_PTON)|g' \
 	      -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \
 	      -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	      < $(srcdir)/arpa_inet.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
 MOSTLYCLEANDIRS += arpa
 EXTRA_DIST += arpa_inet.in.h
 ## end   gnulib module arpa_inet
 ## begin gnulib module base64
@ -95,6 +107,15 @@ libgnu_a_SOURCES += base64.h base64.c
 ## end   gnulib module base64
 ## begin gnulib module btowc
 EXTRA_DIST += btowc.c
 EXTRA_libgnu_a_SOURCES += btowc.c
 ## end   gnulib module btowc
 ## begin gnulib module c-strtod
@ -133,7 +154,7 @@ EXTRA_libgnu_a_SOURCES += cloexec.c
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
-	rm -f $@-t $@
+	rm -f $@-t
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  echo '#define PREFIX "$(prefix)"'; \
 	  echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
@ -163,7 +184,12 @@ configmake.h: Makefile
 	  echo '#define PKGLIBDIR "$(pkglibdir)"'; \
 	  echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
 	} | sed '/""/d' > $@-t
-	mv $@-t $@
+	if test -f $@ && cmp $@-t $@ > /dev/null; then \
 	  rm -f $@-t; \
 	else \
 	  rm -f $@; mv $@-t $@; \
 	fi
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t
@ -178,6 +204,33 @@ EXTRA_libgnu_a_SOURCES += basename.c dirname.c stripslash.c
 ## end   gnulib module dirname
 ## begin gnulib module errno
 BUILT_SOURCES += $(ERRNO_H)
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
 errno.h: errno.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
 	      -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
 	      -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
 	      -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
 	      -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
 	      -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
 	      -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
 	      < $(srcdir)/errno.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += errno.h errno.h-t
 EXTRA_DIST += errno.in.h
 ## end   gnulib module errno
 ## begin gnulib module error
@ -196,6 +249,29 @@ EXTRA_libgnu_a_SOURCES += exitfail.c
 ## end   gnulib module exitfail
 ## begin gnulib module fcntl
 BUILT_SOURCES += $(FCNTL_H)
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
 fcntl.h: fcntl.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
 	      -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
 	      -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
 	      < $(srcdir)/fcntl.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += fcntl.h fcntl.h-t
 EXTRA_DIST += fcntl.in.h
 ## end   gnulib module fcntl
 ## begin gnulib module fcntl-safer
@ -214,7 +290,8 @@ BUILT_SOURCES += $(FLOAT_H)
 float.h: float.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
 	      < $(srcdir)/float.in.h; \
 	} > $@-t
@ -258,7 +335,7 @@ libgnu_a_SOURCES += full-write.h full-write.c
 ## begin gnulib module getaddrinfo
-EXTRA_DIST += gai_strerror.c getaddrinfo.c getaddrinfo.h
+EXTRA_DIST += gai_strerror.c getaddrinfo.c
 EXTRA_libgnu_a_SOURCES += gai_strerror.c getaddrinfo.c
@ -333,7 +410,7 @@ EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
 ## begin gnulib module inet_ntop
-EXTRA_DIST += inet_ntop.c inet_ntop.h
+EXTRA_DIST += inet_ntop.c
 EXTRA_libgnu_a_SOURCES += inet_ntop.c
@ -369,21 +446,37 @@ all-local: charset.alias ref-add.sed ref-del.sed
 charset_alias = $(DESTDIR)$(libdir)/charset.alias
 charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
-install-exec-local: all-local
+install-exec-local: install-exec-localcharset
-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+install-exec-localcharset: all-local
 	if test $(GLIBC21) = no; then \
 	  case '$(host_os)' in \
 	    darwin[56]*) \
 	      need_charset_alias=true ;; \
 	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
 	      need_charset_alias=false ;; \
 	    *) \
 	      need_charset_alias=true ;; \
 	  esac ; \
 	else \
 	  need_charset_alias=false ; \
 	fi ; \
 	if $$need_charset_alias; then \
 	  $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
 	fi ; \
 	if test -f $(charset_alias); then \
 	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
 	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	  rm -f $(charset_tmp) ; \
 	else \
-	  if test $(GLIBC21) = no; then \
+	  if $$need_charset_alias; then \
 	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
 	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
 	    rm -f $(charset_tmp) ; \
 	  fi ; \
 	fi
-uninstall-local: all-local
+uninstall-local: uninstall-localcharset
 uninstall-localcharset: all-local
 	if test -f $(charset_alias); then \
 	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
 	  if grep '^# Packages using this file: $$' $(charset_tmp) \
@ -439,7 +532,8 @@ BUILT_SOURCES += math.h
 math.h: math.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_MATH_H''@|$(NEXT_MATH_H)|g' \
 	      -e 's|@''GNULIB_CEILF''@|$(GNULIB_CEILF)|g' \
 	      -e 's|@''GNULIB_CEILL''@|$(GNULIB_CEILL)|g' \
@ -448,6 +542,11 @@ math.h: math.in.h
 	      -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \
 	      -e 's|@''GNULIB_FREXPL''@|$(GNULIB_FREXPL)|g' \
 	      -e 's|@''GNULIB_ISFINITE''@|$(GNULIB_ISFINITE)|g' \
 	      -e 's|@''GNULIB_ISINF''@|$(GNULIB_ISINF)|g' \
 	      -e 's|@''GNULIB_ISNAN''@|$(GNULIB_ISNAN)|g' \
 	      -e 's|@''GNULIB_ISNANF''@|$(GNULIB_ISNANF)|g' \
 	      -e 's|@''GNULIB_ISNAND''@|$(GNULIB_ISNAND)|g' \
 	      -e 's|@''GNULIB_ISNANL''@|$(GNULIB_ISNANL)|g' \
 	      -e 's|@''GNULIB_LDEXPL''@|$(GNULIB_LDEXPL)|g' \
 	      -e 's|@''GNULIB_MATHL''@|$(GNULIB_MATHL)|g' \
 	      -e 's|@''GNULIB_ROUND''@|$(GNULIB_ROUND)|g' \
@ -457,6 +556,9 @@ math.h: math.in.h
 	      -e 's|@''GNULIB_TRUNC''@|$(GNULIB_TRUNC)|g' \
 	      -e 's|@''GNULIB_TRUNCF''@|$(GNULIB_TRUNCF)|g' \
 	      -e 's|@''GNULIB_TRUNCL''@|$(GNULIB_TRUNCL)|g' \
 	      -e 's|@''HAVE_ISNANF''@|$(HAVE_ISNANF)|g' \
 	      -e 's|@''HAVE_ISNAND''@|$(HAVE_ISNAND)|g' \
 	      -e 's|@''HAVE_ISNANL''@|$(HAVE_ISNANL)|g' \
 	      -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
 	      -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
 	      -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \
@ -470,20 +572,24 @@ math.h: math.in.h
 	      -e 's|@''HAVE_DECL_TANL''@|$(HAVE_DECL_TANL)|g' \
 	      -e 's|@''HAVE_DECL_TRUNC''@|$(HAVE_DECL_TRUNC)|g' \
 	      -e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \
 	      -e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \
 	      -e 's|@''REPLACE_CEILF''@|$(REPLACE_CEILF)|g' \
 	      -e 's|@''REPLACE_CEILL''@|$(REPLACE_CEILL)|g' \
 	      -e 's|@''REPLACE_FLOORF''@|$(REPLACE_FLOORF)|g' \
 	      -e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \
 	      -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
 	      -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
 	      -e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \
 	      -e 's|@''REPLACE_ISFINITE''@|$(REPLACE_ISFINITE)|g' \
 	      -e 's|@''REPLACE_ISINF''@|$(REPLACE_ISINF)|g' \
 	      -e 's|@''REPLACE_ISNAN''@|$(REPLACE_ISNAN)|g' \
 	      -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \
 	      -e 's|@''REPLACE_NAN''@|$(REPLACE_NAN)|g' \
 	      -e 's|@''REPLACE_ROUND''@|$(REPLACE_ROUND)|g' \
 	      -e 's|@''REPLACE_ROUNDF''@|$(REPLACE_ROUNDF)|g' \
 	      -e 's|@''REPLACE_ROUNDL''@|$(REPLACE_ROUNDL)|g' \
 	      -e 's|@''REPLACE_SIGNBIT''@|$(REPLACE_SIGNBIT)|g' \
 	      -e 's|@''REPLACE_SIGNBIT_USING_GCC''@|$(REPLACE_SIGNBIT_USING_GCC)|g' \
 	      -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	      < $(srcdir)/math.in.h; \
 	} > $@-t
@ -494,6 +600,33 @@ EXTRA_DIST += math.in.h
 ## end   gnulib module math
 ## begin gnulib module mbrtowc
 EXTRA_DIST += mbrtowc.c
 EXTRA_libgnu_a_SOURCES += mbrtowc.c
 ## end   gnulib module mbrtowc
 ## begin gnulib module mbsinit
 EXTRA_DIST += mbsinit.c
 EXTRA_libgnu_a_SOURCES += mbsinit.c
 ## end   gnulib module mbsinit
 ## begin gnulib module mktime
 EXTRA_DIST += mktime.c
 EXTRA_libgnu_a_SOURCES += mktime.c
 ## end   gnulib module mktime
 ## begin gnulib module mountlist
@ -503,6 +636,34 @@ EXTRA_libgnu_a_SOURCES += mountlist.c
 ## end   gnulib module mountlist
 ## begin gnulib module netdb
 BUILT_SOURCES += $(NETDB_H)
 # We need the following in order to create <netdb.h> when the system
 # doesn't have one that works with the given compiler.
 netdb.h: netdb.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_NETDB_H''@|$(NEXT_NETDB_H)|g' \
 	      -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \
 	      -e 's|@''GNULIB_GETADDRINFO''@|$(GNULIB_GETADDRINFO)|g' \
 	      -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \
 	      -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \
 	      -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \
 	      -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \
 	      -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \
 	      < $(srcdir)/netdb.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += netdb.h netdb.h-t
 EXTRA_DIST += netdb.in.h
 ## end   gnulib module netdb
 ## begin gnulib module netinet_in
 BUILT_SOURCES += $(NETINET_IN_H)
@ -513,7 +674,8 @@ netinet/in.h: netinet_in.in.h
 	@MKDIR_P@ netinet
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
 	      -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
 	      < $(srcdir)/netinet_in.in.h; \
@ -526,6 +688,15 @@ EXTRA_DIST += netinet_in.in.h
 ## end   gnulib module netinet_in
 ## begin gnulib module open
 EXTRA_DIST += open.c
 EXTRA_libgnu_a_SOURCES += open.c
 ## end   gnulib module open
 ## begin gnulib module regex
@ -596,7 +767,8 @@ stdint.h: stdint.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
 	      -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
 	      -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
@ -604,6 +776,7 @@ stdint.h: stdint.in.h
 	      -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
 	      -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
 	      -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
 	      -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
 	      -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
 	      -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
 	      -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
@ -635,17 +808,26 @@ BUILT_SOURCES += stdio.h
 stdio.h: stdio.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
 	      -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
 	      -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
 	      -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
 	      -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
 	      -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
 	      -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
 	      -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
 	      -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
 	      -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
 	      -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
 	      -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
 	      -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
 	      -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
 	      -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
 	      -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
 	      -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
 	      -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
 	      -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
 	      -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
 	      -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
@ -653,8 +835,18 @@ stdio.h: stdio.in.h
 	      -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
 	      -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
 	      -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
 	      -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
 	      -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
 	      -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
 	      -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
 	      -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
 	      -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
 	      -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
 	      -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
 	      -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
 	      -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
 	      -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
 	      -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
 	      -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
 	      -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
 	      -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
@ -665,8 +857,14 @@ stdio.h: stdio.in.h
 	      -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
 	      -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
 	      -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
 	      -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
 	      -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
 	      -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
 	      -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \
 	      -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
 	      -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
 	      -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
 	      -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \
 	      -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
 	      -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \
 	      -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \
@ -674,16 +872,20 @@ stdio.h: stdio.in.h
 	      -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
 	      -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
 	      -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
 	      -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
 	      -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
 	      -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
 	      -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
 	      -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	      < $(srcdir)/stdio.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += stdio.h stdio.h-t
-EXTRA_DIST += stdio.in.h
+EXTRA_DIST += stdio-write.c stdio.in.h
 EXTRA_libgnu_a_SOURCES += stdio-write.c
 ## end   gnulib module stdio
@ -696,26 +898,45 @@ BUILT_SOURCES += stdlib.h
 stdlib.h: stdlib.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
 	      -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
 	      -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
 	      -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
 	      -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
 	      -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
 	      -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
 	      -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
 	      -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
 	      -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
 	      -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
 	      -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
 	      -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
 	      -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
 	      -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
 	      -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
 	      -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
 	      -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
 	      -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
 	      -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
 	      -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
 	      -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
 	      -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
 	      -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
 	      -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
 	      -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
 	      -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
 	      -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
 	      -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
 	      -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
 	      -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
 	      -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
 	      -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
 	      -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
 	      -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
 	      -e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	      < $(srcdir)/stdlib.in.h; \
@ -727,14 +948,21 @@ EXTRA_DIST += stdlib.in.h
 ## end   gnulib module stdlib
-## begin gnulib module strdup
+## begin gnulib module strdup-posix
 EXTRA_DIST += strdup.c
 EXTRA_libgnu_a_SOURCES += strdup.c
-## end   gnulib module strdup
+## end   gnulib module strdup-posix
 ## begin gnulib module streq
 EXTRA_DIST += streq.h
 ## end   gnulib module streq
 ## begin gnulib module strerror
@ -754,7 +982,8 @@ BUILT_SOURCES += string.h
 string.h: string.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
 	      -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
 	      -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
@ -773,6 +1002,7 @@ string.h: string.in.h
 	      -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
 	      -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
 	      -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
 	      -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
 	      -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
 	      -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
 	      -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
@ -786,9 +1016,11 @@ string.h: string.in.h
 	      -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
 	      -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
 	      -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
 	      -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
 	      -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
 	      -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
 	      -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
 	      -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \
 	      -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
 	      -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
 	      -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \
@ -802,8 +1034,10 @@ string.h: string.in.h
 	      -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
 	      -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \
 	      -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
 	      -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
 	      -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
 	      -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
 	      -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
 	      -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
 	      -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
 	      -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
@ -844,11 +1078,29 @@ BUILT_SOURCES += $(SYS_SOCKET_H)
 sys/socket.h: sys_socket.in.h
 	@MKDIR_P@ sys
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
 	      -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \
 	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
 	      -e 's|@''GNULIB_SOCKET''@|$(GNULIB_SOCKET)|g' \
 	      -e 's|@''GNULIB_CONNECT''@|$(GNULIB_CONNECT)|g' \
 	      -e 's|@''GNULIB_ACCEPT''@|$(GNULIB_ACCEPT)|g' \
 	      -e 's|@''GNULIB_BIND''@|$(GNULIB_BIND)|g' \
 	      -e 's|@''GNULIB_GETPEERNAME''@|$(GNULIB_GETPEERNAME)|g' \
 	      -e 's|@''GNULIB_GETSOCKNAME''@|$(GNULIB_GETSOCKNAME)|g' \
 	      -e 's|@''GNULIB_GETSOCKOPT''@|$(GNULIB_GETSOCKOPT)|g' \
 	      -e 's|@''GNULIB_LISTEN''@|$(GNULIB_LISTEN)|g' \
 	      -e 's|@''GNULIB_RECV''@|$(GNULIB_RECV)|g' \
 	      -e 's|@''GNULIB_SEND''@|$(GNULIB_SEND)|g' \
 	      -e 's|@''GNULIB_RECVFROM''@|$(GNULIB_RECVFROM)|g' \
 	      -e 's|@''GNULIB_SENDTO''@|$(GNULIB_SENDTO)|g' \
 	      -e 's|@''GNULIB_SETSOCKOPT''@|$(GNULIB_SETSOCKOPT)|g' \
 	      -e 's|@''GNULIB_SHUTDOWN''@|$(GNULIB_SHUTDOWN)|g' \
 	      -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
 	      -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
 	      -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	      < $(srcdir)/sys_socket.in.h; \
 	} > $@-t
 	mv -f $@-t $@
@ -859,6 +1111,51 @@ EXTRA_DIST += sys_socket.in.h
 ## end   gnulib module sys_socket
 ## begin gnulib module time
 BUILT_SOURCES += time.h
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
 time.h: time.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
 	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
 	      -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
 	      -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
 	      -e 's|@REPLACE_STRPTIME''@|$(REPLACE_STRPTIME)|g' \
 	      -e 's|@REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
 	      -e 's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      -e 's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
 	      < $(srcdir)/time.in.h; \
 	} > $@-t
 	mv $@-t $@
 MOSTLYCLEANFILES += time.h time.h-t
 EXTRA_DIST += time.in.h
 ## end   gnulib module time
 ## begin gnulib module time_r
 EXTRA_DIST += time_r.c
 EXTRA_libgnu_a_SOURCES += time_r.c
 ## end   gnulib module time_r
 ## begin gnulib module timegm
 EXTRA_DIST += timegm.c
 EXTRA_libgnu_a_SOURCES += timegm.c
 ## end   gnulib module timegm
 ## begin gnulib module unistd
 BUILT_SOURCES += unistd.h
@ -869,33 +1166,57 @@ unistd.h: unistd.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
-	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
 	      -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
 	      -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
 	      -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
 	      -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
 	      -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
 	      -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
 	      -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
 	      -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
 	      -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
 	      -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
 	      -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
 	      -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
 	      -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
 	      -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
 	      -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
 	      -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
 	      -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
 	      -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
 	      -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
 	      -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
 	      -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
 	      -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
 	      -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
 	      -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
 	      -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
 	      -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
 	      -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \
 	      -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
 	      -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
 	      -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \
 	      -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
 	      -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
 	      -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
 	      -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
 	      -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
 	      -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
 	      -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
 	      -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
 	      -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
 	      -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
 	      -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \
 	      -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	      < $(srcdir)/unistd.in.h; \
 	} > $@-t
 	mv $@-t $@
@ -932,6 +1253,12 @@ EXTRA_libgnu_a_SOURCES += asprintf.c vasprintf.c
 ## end   gnulib module vasprintf
 ## begin gnulib module verify
 libgnu_a_SOURCES += verify.h
 ## end   gnulib module verify
 ## begin gnulib module vsnprintf
@ -950,11 +1277,44 @@ BUILT_SOURCES += $(WCHAR_H)
 wchar.h: wchar.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	  sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
-	      -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+	      -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
 	      -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
 	      -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
 	      -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
 	      -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
 	      -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
 	      -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
 	      -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
 	      -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
 	      -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
 	      -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
 	      -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
 	      -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
 	      -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
 	      -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
 	      -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
 	      -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
 	      -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
 	      -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
 	      -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
 	      -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
 	      -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
 	      -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
 	      -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
 	      -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
 	      -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
 	      -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
 	      -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
 	      -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
 	      -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
 	      -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
 	      -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
 	      -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
 	      -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
 	      -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
 	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
 	    < $(srcdir)/wchar.in.h; \
@ -966,6 +1326,15 @@ EXTRA_DIST += wchar.in.h
 ## end   gnulib module wchar
 ## begin gnulib module wcrtomb
 EXTRA_DIST += wcrtomb.c
 EXTRA_libgnu_a_SOURCES += wcrtomb.c
 ## end   gnulib module wcrtomb
 ## begin gnulib module wctype
 BUILT_SOURCES += $(WCTYPE_H)
@ -976,10 +1345,12 @@ wctype.h: wctype.in.h
 	rm -f $@-t $@
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
 	  sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-	      -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+	      -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
 	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
 	      -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
 	      -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
 	      -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
 	      -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
 	      < $(srcdir)/wctype.in.h; \
 	} > $@-t
 	mv $@-t $@
@ -989,6 +1360,15 @@ EXTRA_DIST += wctype.in.h
 ## end   gnulib module wctype
 ## begin gnulib module write
 EXTRA_DIST += write.c
 EXTRA_libgnu_a_SOURCES += write.c
 ## end   gnulib module write
 ## begin gnulib module xalloc
--- a/gl/Makefile.in
+++ b/gl/Makefile.in
--- a/gl/alignof.h
+++ b/gl/alignof.h
@ -0,0 +1,33 @@
 /* Determine alignment of types.
   Copyright (C) 2003-2004, 2006, 2009 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
   the Free Software Foundation; either version 3, 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.  */
 #ifndef _ALIGNOF_H
 #define _ALIGNOF_H
 #include <stddef.h>
 /* Determine the alignment of a type at compile time.  */
 #if defined __GNUC__
 # define alignof __alignof__
 #elif defined __cplusplus
  template <class type> struct alignof_helper { char __slot1; type __slot2; };
 # define alignof(type) offsetof (alignof_helper<type>, __slot2)
 #else
 # define alignof(type) offsetof (struct { char __slot1; type __slot2; }, __slot2)
 #endif
 #endif /* _ALIGNOF_H */
--- a/gl/alloca.in.h
+++ b/gl/alloca.in.h
@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2007 Free Software
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2008 Free Software
   Foundation, Inc.
   This program is free software; you can redistribute it and/or modify it
@ -42,6 +42,8 @@
 # elif defined _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
 # elif defined __DECC && defined __VMS
 #  define alloca __ALLOCA
 # else
 #  include <stddef.h>
 #  ifdef  __cplusplus
--- a/gl/arpa_inet.in.h
+++ b/gl/arpa_inet.in.h
@ -1,5 +1,6 @@
-/* Convert internet address from internal to printable, presentable format.
+/* A GNU-like <arpa/inet.h>.
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+
   Copyright (C) 2005-2006, 2008 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
@ -15,11 +16,34 @@
   along with this program; if not, write to the Free Software Foundation,
   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-#include <sys/types.h>
+#ifndef _GL_ARPA_INET_H
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 /* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc
   under MinGW. */
 #include <sys/socket.h>
 #if @HAVE_ARPA_INET_H@
 # if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
 # endif
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_ARPA_INET_H@
 #endif
 #ifndef _GL_ARPA_INET_H
 #define _GL_ARPA_INET_H
 /* The definition of GL_LINK_WARNING is copied here.  */
 #ifdef __cplusplus
 extern "C" {
 #endif
 #if @GNULIB_INET_NTOP@
 # if !@HAVE_DECL_INET_NTOP@
 /* Converts an internet address from internal format to a printable,
   presentable format.
   AF is an internet address family, such as AF_INET or AF_INET6.
@ -35,8 +59,32 @@
   For more details, see the POSIX:2001 specification
   <http://www.opengroup.org/susv3xsh/inet_ntop.html>.  */
 #if !HAVE_DECL_INET_NTOP
 extern const char *inet_ntop (int af, const void *restrict src,
 			      char *restrict dst, socklen_t cnt);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef inet_ntop
 # define inet_ntop(af,src,dst,cnt) \
    (GL_LINK_WARNING ("inet_ntop is unportable - " \
                      "use gnulib module inet_ntop for portability"), \
     inet_ntop (af, src, dst, cnt))
 #endif
 #if @GNULIB_INET_PTON@
 # if !@HAVE_DECL_INET_PTON@
 extern int inet_pton (int af, const char *restrict src, void *restrict dst);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef inet_pton
 # define inet_pton(af,src,dst) \
  (GL_LINK_WARNING ("inet_pton is unportable - " \
 		    "use gnulib module inet_pton for portability"), \
   inet_pton (af, src, dst))
 #endif
 #ifdef __cplusplus
 }
 #endif
 #endif /* _GL_ARPA_INET_H */
 #endif /* _GL_ARPA_INET_H */
--- a/gl/base64.c
+++ b/gl/base64.c
@ -52,6 +52,8 @@
 /* Get UCHAR_MAX. */
 #include <limits.h>
 #include <string.h>
 /* C89 compliant way to cast 'char' to 'unsigned char'. */
 static inline unsigned char
 to_uchar (char ch)
@ -300,89 +302,237 @@ isbase64 (char ch)
  return uchar_in_range (to_uchar (ch)) && 0 <= b64[to_uchar (ch)];
 }
-/* Decode base64 encoded input array IN of length INLEN to output
+/* Initialize decode-context buffer, CTX.  */
-   array OUT that can hold *OUTLEN bytes.  Return true if decoding was
+void
-   successful, i.e. if the input was valid base64 data, false
+base64_decode_ctx_init (struct base64_decode_context *ctx)
   otherwise.  If *OUTLEN is too small, as many bytes as possible will
   be written to OUT.  On return, *OUTLEN holds the length of decoded
   bytes in OUT.  Note that as soon as any non-alphabet characters are
   encountered, decoding is stopped and false is returned.  This means
   that, when applicable, you must remove any line terminators that is
   part of the data stream before calling this function.  */
 bool
 base64_decode (const char *restrict in, size_t inlen,
 	       char *restrict out, size_t *outlen)
 {
-  size_t outleft = *outlen;
+  ctx->i = 0;
 }
-  while (inlen >= 2)
+/* If CTX->i is 0 or 4, there are four or more bytes in [*IN..IN_END), and
   none of those four is a newline, then return *IN.  Otherwise, copy up to
   4 - CTX->i non-newline bytes from that range into CTX->buf, starting at
   index CTX->i and setting CTX->i to reflect the number of bytes copied,
   and return CTX->buf.  In either case, advance *IN to point to the byte
   after the last one processed, and set *N_NON_NEWLINE to the number of
   verified non-newline bytes accessible through the returned pointer.  */
 static inline char *
 get_4 (struct base64_decode_context *ctx,
       char const *restrict *in, char const *restrict in_end,
       size_t *n_non_newline)
 {
  if (ctx->i == 4)
    ctx->i = 0;
  if (ctx->i == 0)
    {
-      if (!isbase64 (in[0]) || !isbase64 (in[1]))
+      char const *t = *in;
-	break;
+      if (4 <= in_end - *in && memchr (t, '\n', 4) == NULL)
      if (outleft)
 	{
-	  *out++ = ((b64[to_uchar (in[0])] << 2)
+	  /* This is the common case: no newline.  */
-		    | (b64[to_uchar (in[1])] >> 4));
+	  *in += 4;
-	  outleft--;
+	  *n_non_newline = 4;
 	  return (char *) t;
 	}
    }
  {
    /* Copy non-newline bytes into BUF.  */
    char const *p = *in;
    while (p < in_end)
      {
 	char c = *p++;
 	if (c != '\n')
 	  {
 	    ctx->buf[ctx->i++] = c;
 	    if (ctx->i == 4)
 	      break;
 	  }
      }
    *in = p;
    *n_non_newline = ctx->i;
    return ctx->buf;
  }
 }
 #define return_false				\
  do						\
    {						\
      *outp = out;				\
      return false;				\
    }						\
  while (false)
 /* Decode up to four bytes of base64-encoded data, IN, of length INLEN
   into the output buffer, *OUT, of size *OUTLEN bytes.  Return true if
   decoding is successful, false otherwise.  If *OUTLEN is too small,
   as many bytes as possible are written to *OUT.  On return, advance
   *OUT to point to the byte after the last one written, and decrement
   *OUTLEN to reflect the number of bytes remaining in *OUT.  */
 static inline bool
 decode_4 (char const *restrict in, size_t inlen,
 	  char *restrict *outp, size_t *outleft)
 {
  char *out = *outp;
  if (inlen < 2)
    return false;
  if (!isbase64 (in[0]) || !isbase64 (in[1]))
    return false;
  if (*outleft)
    {
      *out++ = ((b64[to_uchar (in[0])] << 2)
 		| (b64[to_uchar (in[1])] >> 4));
      --*outleft;
    }
  if (inlen == 2)
    return_false;
  if (in[2] == '=')
    {
      if (inlen != 4)
 	return_false;
      if (in[3] != '=')
 	return_false;
    }
  else
    {
      if (!isbase64 (in[2]))
 	return_false;
      if (*outleft)
 	{
 	  *out++ = (((b64[to_uchar (in[1])] << 4) & 0xf0)
 		    | (b64[to_uchar (in[2])] >> 2));
 	  --*outleft;
 	}
-      if (inlen == 2)
+      if (inlen == 3)
-	break;
+	return_false;
-      if (in[2] == '=')
+      if (in[3] == '=')
 	{
 	  if (inlen != 4)
-	    break;
+	    return_false;
 	  if (in[3] != '=')
 	    break;
 	}
      else
 	{
-	  if (!isbase64 (in[2]))
+	  if (!isbase64 (in[3]))
-	    break;
+	    return_false;
-	  if (outleft)
+	  if (*outleft)
 	    {
-	      *out++ = (((b64[to_uchar (in[1])] << 4) & 0xf0)
+	      *out++ = (((b64[to_uchar (in[2])] << 6) & 0xc0)
-			| (b64[to_uchar (in[2])] >> 2));
+			| b64[to_uchar (in[3])]);
-	      outleft--;
+	      --*outleft;
 	    }
 	}
    }
-	  if (inlen == 3)
+  *outp = out;
-	    break;
+  return true;
 }
-	  if (in[3] == '=')
+/* Decode base64-encoded input array IN of length INLEN to output array
   OUT that can hold *OUTLEN bytes.  The input data may be interspersed
   with newlines.  Return true if decoding was successful, i.e. if the
   input was valid base64 data, false otherwise.  If *OUTLEN is too
   small, as many bytes as possible will be written to OUT.  On return,
   *OUTLEN holds the length of decoded bytes in OUT.  Note that as soon
   as any non-alphabet, non-newline character is encountered, decoding
   is stopped and false is returned.  If INLEN is zero, then process
   only whatever data is stored in CTX.
   Initially, CTX must have been initialized via base64_decode_ctx_init.
   Subsequent calls to this function must reuse whatever state is recorded
   in that buffer.  It is necessary for when a quadruple of base64 input
   bytes spans two input buffers.
   If CTX is NULL then newlines are treated as garbage and the input
   buffer is processed as a unit.  */
 bool
 base64_decode_ctx (struct base64_decode_context *ctx,
 		   const char *restrict in, size_t inlen,
 		   char *restrict out, size_t *outlen)
 {
  size_t outleft = *outlen;
  bool ignore_newlines = ctx != NULL;
  bool flush_ctx = false;
  unsigned int ctx_i = 0;
  if (ignore_newlines)
    {
      ctx_i = ctx->i;
      flush_ctx = inlen == 0;
    }
  while (true)
    {
      size_t outleft_save = outleft;
      if (ctx_i == 0 && !flush_ctx)
 	{
 	  while (true)
 	    {
-	      if (inlen != 4)
+	      /* Save a copy of outleft, in case we need to re-parse this
-		break;
+		 block of four bytes.  */
-	    }
+	      outleft_save = outleft;
-	  else
+	      if (!decode_4 (in, inlen, &out, &outleft))
 	    {
 	      if (!isbase64 (in[3]))
 		break;
-	      if (outleft)
+	      in += 4;
-		{
+	      inlen -= 4;
 		  *out++ = (((b64[to_uchar (in[2])] << 6) & 0xc0)
 			    | b64[to_uchar (in[3])]);
 		  outleft--;
 		}
 	    }
 	}
-      in += 4;
+      if (inlen == 0 && !flush_ctx)
-      inlen -= 4;
+	break;
      /* Handle the common case of 72-byte wrapped lines.
 	 This also handles any other multiple-of-4-byte wrapping.  */
      if (inlen && *in == '\n' && ignore_newlines)
 	{
 	  ++in;
 	  --inlen;
 	  continue;
 	}
      /* Restore OUT and OUTLEFT.  */
      out -= outleft_save - outleft;
      outleft = outleft_save;
      {
 	char const *in_end = in + inlen;
 	char const *non_nl;
 	if (ignore_newlines)
 	  non_nl = get_4 (ctx, &in, in_end, &inlen);
 	else
 	  non_nl = in;  /* Might have nl in this case. */
 	/* If the input is empty or consists solely of newlines (0 non-newlines),
 	   then we're done.  Likewise if there are fewer than 4 bytes when not
 	   flushing context and not treating newlines as garbage.  */
 	if (inlen == 0 || (inlen < 4 && !flush_ctx && ignore_newlines))
 	  {
 	    inlen = 0;
 	    break;
 	  }
 	if (!decode_4 (non_nl, inlen, &out, &outleft))
 	  break;
 	inlen = in_end - in;
      }
    }
  *outlen -= outleft;
-  if (inlen != 0)
+  return inlen == 0;
    return false;
  return true;
 }
 /* Allocate an output buffer in *OUT, and decode the base64 encoded
@ -397,12 +547,13 @@ base64_decode (const char *restrict in, size_t inlen,
   input was invalid, in which case *OUT is NULL and *OUTLEN is
   undefined. */
 bool
-base64_decode_alloc (const char *in, size_t inlen, char **out,
+base64_decode_alloc_ctx (struct base64_decode_context *ctx,
-		     size_t *outlen)
+			 const char *in, size_t inlen, char **out,
 			 size_t *outlen)
 {
-  /* This may allocate a few bytes too much, depending on input,
+  /* This may allocate a few bytes too many, depending on input,
-     but it's not worth the extra CPU time to compute the exact amount.
+     but it's not worth the extra CPU time to compute the exact size.
-     The exact amount is 3 * inlen / 4, minus 1 if the input ends
+     The exact size is 3 * inlen / 4, minus 1 if the input ends
     with "=" and minus another 1 if the input ends with "==".
     Dividing before multiplying avoids the possibility of overflow.  */
  size_t needlen = 3 * (inlen / 4) + 2;
@ -411,7 +562,7 @@ base64_decode_alloc (const char *in, size_t inlen, char **out,
  if (!*out)
    return true;
-  if (!base64_decode (in, inlen, *out, &needlen))
+  if (!base64_decode_ctx (ctx, in, inlen, *out, &needlen))
    {
      free (*out);
      *out = NULL;
--- a/gl/base64.h
+++ b/gl/base64.h
@ -29,6 +29,12 @@
   integer >= n/k, i.e., the ceiling of n/k.  */
 # define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4)
 struct base64_decode_context
 {
  unsigned int i;
  char buf[4];
 };
 extern bool isbase64 (char ch);
 extern void base64_encode (const char *restrict in, size_t inlen,
@ -36,10 +42,20 @@ extern void base64_encode (const char *restrict in, size_t inlen,
 extern size_t base64_encode_alloc (const char *in, size_t inlen, char **out);
-extern bool base64_decode (const char *restrict in, size_t inlen,
+extern void base64_decode_ctx_init (struct base64_decode_context *ctx);
 			   char *restrict out, size_t *outlen);
-extern bool base64_decode_alloc (const char *in, size_t inlen,
+extern bool base64_decode_ctx (struct base64_decode_context *ctx,
-				 char **out, size_t *outlen);
+			       const char *restrict in, size_t inlen,
 			       char *restrict out, size_t *outlen);
 extern bool base64_decode_alloc_ctx (struct base64_decode_context *ctx,
 				     const char *in, size_t inlen,
 				     char **out, size_t *outlen);
 #define base64_decode(in, inlen, out, outlen) \
 	base64_decode_ctx (NULL, in, inlen, out, outlen)
 #define base64_decode_alloc(in, inlen, out, outlen) \
 	base64_decode_alloc_ctx (NULL, in, inlen, out, outlen)
 #endif /* BASE64_H */
--- a/gl/btowc.c
+++ b/gl/btowc.c
@ -0,0 +1,38 @@
 /* Convert unibyte character to wide character.
   Copyright (C) 2008 Free Software Foundation, Inc.
   Written by Bruno Haible <bruno@clisp.org>, 2008.
   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/>.  */
 #include <config.h>
 /* Specification.  */
 #include <wchar.h>
 #include <stdio.h>
 wint_t
 btowc (int c)
 {
  if (c != EOF)
    {
      char buf[1];
      wchar_t wc;
      buf[0] = c;
      if (mbtowc (&wc, buf, 1) >= 0)
 	return wc;
    }
  return WEOF;
 }
--- a/gl/c-strtod.c
+++ b/gl/c-strtod.c
@ -1,6 +1,6 @@
 /* Convert string to double, using the C locale.
-   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006, 2009 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,10 +21,10 @@
 #include "c-strtod.h"
 #include <errno.h>
 #include <locale.h>
 #include <stdlib.h>
-
+#include <string.h>
 #include "xalloc.h"
 #if LONG
 # define C_STRTOD c_strtold
@ -43,6 +43,25 @@
 # define STRTOD strtod
 #endif
 #ifdef LC_ALL_MASK
 /* Cache for the C locale object.
   Marked volatile so that different threads see the same value
   (avoids locking).  */
 static volatile locale_t c_locale_cache;
 /* Return the C locale object, or (locale_t) 0 with errno set
   if it cannot be created.  */
 static inline locale_t
 c_locale (void)
 {
  if (!c_locale_cache)
    c_locale_cache = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
  return c_locale_cache;
 }
 #endif
 DOUBLE
 C_STRTOD (char const *nptr, char **endptr)
 {
@ -50,9 +69,15 @@ C_STRTOD (char const *nptr, char **endptr)
 #ifdef LC_ALL_MASK
-  locale_t c_locale = newlocale (LC_ALL_MASK, "C", 0);
+  locale_t locale = c_locale ();
-  r = STRTOD_L (nptr, endptr, c_locale);
+  if (!locale)
-  freelocale (c_locale);
+    {
      if (endptr)
 	*endptr = (char *) nptr;
      return 0; /* errno is set here */
    }
  r = STRTOD_L (nptr, endptr, locale);
 #else
@ -60,7 +85,13 @@ C_STRTOD (char const *nptr, char **endptr)
  if (saved_locale)
    {
-      saved_locale = xstrdup (saved_locale);
+      saved_locale = strdup (saved_locale);
      if (saved_locale == NULL)
 	{
 	  if (endptr)
 	    *endptr = (char *) nptr;
 	  return 0; /* errno is set here */
 	}
      setlocale (LC_NUMERIC, "C");
    }
@ -68,8 +99,11 @@ C_STRTOD (char const *nptr, char **endptr)
  if (saved_locale)
    {
      int saved_errno = errno;
      setlocale (LC_NUMERIC, saved_locale);
      free (saved_locale);
      errno = saved_errno;
    }
 #endif
--- a/gl/c-strtod.h
+++ b/gl/c-strtod.h
@ -1,2 +1,37 @@
-double c_strtod (char const *, char **);
+/* Convert string to double, using the C locale.
-long double c_strtold (char const *, char **);
+
   Copyright (C) 2003-2004, 2009 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
   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/>.  */
 /* Parse the initial portion of the string pointed to by NPTR as a floating-
   point number (in decimal or hexadecimal notation), like in the C locale:
   accepting only the ASCII digits '0'..'9', and only '.' as decimal point
   character.
   If ENDPTR is not NULL, set *ENDPTR to point to the first byte beyond the
   parsed number or to NPTR if the string does not start with a parseable
   number.
   Return value:
   - If successful, return the value as a double or 'long double',
     respectively, and don't modify errno.
   - In case of overflow, return ±HUGE_VAL or ±HUGE_VALL, respectively, and
     set errno to ERANGE.
   - In case of underflow, return a value very near to 0 and set errno to
     ERANGE.
   - If the string does not start with a number at all, return 0 (and recall
     that if ENDPTR != NULL, *ENDPTR is set to NPTR), and maybe set errno to
     EINVAL.
   - In case of other error, return 0 and set errno, for example to ENOMEM.  */
 extern double      c_strtod  (char const *nptr, char **endptr);
 extern long double c_strtold (char const *nptr, char **endptr);
--- a/gl/config.charset
+++ b/gl/config.charset
@ -1,7 +1,7 @@
 #! /bin/sh
 # Output a system dependent table of character encoding aliases.
 #
-#   Copyright (C) 2000-2004, 2006-2007 Free Software Foundation, Inc.
+#   Copyright (C) 2000-2004, 2006-2009 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
@ -63,12 +63,13 @@
 #   CP922                       aix
 #   CP932                       aix woe32 dos
 #   CP943                       aix
-#   CP949                       osf woe32 dos
+#   CP949                       osf darwin woe32 dos
 #   CP950                       woe32 dos
 #   CP1046                      aix
 #   CP1124                      aix
 #   CP1125                      dos
 #   CP1129                      aix
 #   CP1131                      darwin
 #   CP1250                      woe32
 #   CP1251                      glibc solaris netbsd openbsd darwin woe32
 #   CP1252                      aix woe32
@ -82,15 +83,17 @@
 #   EUC-KR                  Y   glibc aix hpux irix osf solaris freebsd netbsd darwin
 #   EUC-TW                      glibc aix hpux irix osf solaris netbsd
 #   BIG5                    Y   glibc aix hpux osf solaris freebsd netbsd darwin
-#   BIG5-HKSCS                  glibc solaris
+#   BIG5-HKSCS                  glibc solaris darwin
-#   GBK                         glibc aix osf solaris woe32 dos
+#   GBK                         glibc aix osf solaris darwin woe32 dos
-#   GB18030                     glibc solaris netbsd
+#   GB18030                     glibc solaris netbsd darwin
 #   SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
 #   JOHAB                       glibc solaris woe32
 #   TIS-620                     glibc aix hpux osf solaris
 #   VISCII                  Y   glibc
 #   TCVN5712-1                  glibc
 #   ARMSCII-8                   glibc darwin
 #   GEORGIAN-PS                 glibc
 #   PT154                       glibc
 #   HP-ROMAN8                   hpux
 #   HP-ARABIC8                  hpux
 #   HP-GREEK8                   hpux
@ -449,7 +452,8 @@ case "$os" in
 	echo "ko_KR.EUC EUC-KR"
 	;;
    darwin*)
-	# Darwin 7.5 has nl_langinfo(CODESET), but it is useless:
+	# Darwin 7.5 has nl_langinfo(CODESET), but sometimes its value is
 	# useless:
 	# - It returns the empty string when LANG is set to a locale of the
 	#   form ll_CC, although ll_CC/LC_CTYPE is a symlink to an UTF-8
 	#   LC_CTYPE file.
@ -476,10 +480,40 @@ case "$os" in
 	# minimize the use of decomposed Unicode. Unfortunately, through the
 	# Darwin file system, decomposed UTF-8 strings are leaked into user
 	# space nevertheless.
 	# Then there are also the locales with encodings other than US-ASCII
 	# and UTF-8. These locales can be occasionally useful to users (e.g.
 	# when grepping through ISO-8859-1 encoded text files), when all their
 	# file names are in US-ASCII.
 	echo "ISO8859-1 ISO-8859-1"
 	echo "ISO8859-2 ISO-8859-2"
 	echo "ISO8859-4 ISO-8859-4"
 	echo "ISO8859-5 ISO-8859-5"
 	echo "ISO8859-7 ISO-8859-7"
 	echo "ISO8859-9 ISO-8859-9"
 	echo "ISO8859-13 ISO-8859-13"
 	echo "ISO8859-15 ISO-8859-15"
 	echo "KOI8-R KOI8-R"
 	echo "KOI8-U KOI8-U"
 	echo "CP866 CP866"
 	echo "CP949 CP949"
 	echo "CP1131 CP1131"
 	echo "CP1251 CP1251"
 	echo "eucCN GB2312"
 	echo "GB2312 GB2312"
 	echo "eucJP EUC-JP"
 	echo "eucKR EUC-KR"
 	echo "Big5 BIG5"
 	echo "Big5HKSCS BIG5-HKSCS"
 	echo "GBK GBK"
 	echo "GB18030 GB18030"
 	echo "SJIS SHIFT_JIS"
 	echo "ARMSCII-8 ARMSCII-8"
 	echo "PT154 PT154"
 	#echo "ISCII-DEV ?"
 	echo "* UTF-8"
 	;;
-    beos*)
+    beos* | haiku*)
-	# BeOS has a single locale, and it has UTF-8 encoding.
+	# BeOS and Haiku have a single locale, and it has UTF-8 encoding.
 	echo "* UTF-8"
 	;;
    msdosdjgpp*)
--- a/gl/dup-safer.c
+++ b/gl/dup-safer.c
@ -1,6 +1,7 @@
 /* Invoke dup, but avoid some glitches.
-   Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004, 2005, 2006, 2009 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
@ -24,9 +25,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #ifndef STDERR_FILENO
 # define STDERR_FILENO 2
 #endif
 /* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
   STDERR_FILENO.  */
--- a/gl/errno.in.h
+++ b/gl/errno.in.h
@ -0,0 +1,155 @@
 /* A POSIX-like <errno.h>.
   Copyright (C) 2008 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
   the Free Software Foundation; either version 3, 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.  */
 #ifndef _GL_ERRNO_H
 #if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
 #endif
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_ERRNO_H@
 #ifndef _GL_ERRNO_H
 #define _GL_ERRNO_H
 /* On native Windows platforms, many macros are not defined.  */
 # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
 /* POSIX says that EAGAIN and EWOULDBLOCK may have the same value.  */
 #  define EWOULDBLOCK     EAGAIN
 /* Values >= 100 seem safe to use.  */
 #  define ETXTBSY   100
 #  define GNULIB_defined_ETXTBSY 1
 /* These are intentionally the same values as the WSA* error numbers, defined
   in <winsock2.h>.  */
 #  define EINPROGRESS     10036
 #  define EALREADY        10037
 #  define ENOTSOCK        10038
 #  define EDESTADDRREQ    10039
 #  define EMSGSIZE        10040
 #  define EPROTOTYPE      10041
 #  define ENOPROTOOPT     10042
 #  define EPROTONOSUPPORT 10043
 #  define ESOCKTNOSUPPORT 10044  /* not required by POSIX */
 #  define EOPNOTSUPP      10045
 #  define EPFNOSUPPORT    10046  /* not required by POSIX */
 #  define EAFNOSUPPORT    10047
 #  define EADDRINUSE      10048
 #  define EADDRNOTAVAIL   10049
 #  define ENETDOWN        10050
 #  define ENETUNREACH     10051
 #  define ENETRESET       10052
 #  define ECONNABORTED    10053
 #  define ECONNRESET      10054
 #  define ENOBUFS         10055
 #  define EISCONN         10056
 #  define ENOTCONN        10057
 #  define ESHUTDOWN       10058  /* not required by POSIX */
 #  define ETOOMANYREFS    10059  /* not required by POSIX */
 #  define ETIMEDOUT       10060
 #  define ECONNREFUSED    10061
 #  define ELOOP           10062
 #  define EHOSTDOWN       10064  /* not required by POSIX */
 #  define EHOSTUNREACH    10065
 #  define EPROCLIM        10067  /* not required by POSIX */
 #  define EUSERS          10068  /* not required by POSIX */
 #  define EDQUOT          10069
 #  define ESTALE          10070
 #  define EREMOTE         10071  /* not required by POSIX */
 #  define GNULIB_defined_ESOCK 1
 # endif
 /* On OSF/1 5.1, when _XOPEN_SOURCE_EXTENDED is not defined, the macros
   EMULTIHOP, ENOLINK, EOVERFLOW are not defined.  */
 # if @EMULTIHOP_HIDDEN@
 #  define EMULTIHOP @EMULTIHOP_VALUE@
 #  define GNULIB_defined_EMULTIHOP 1
 # endif
 # if @ENOLINK_HIDDEN@
 #  define ENOLINK   @ENOLINK_VALUE@
 #  define GNULIB_defined_ENOLINK 1
 # endif
 # if @EOVERFLOW_HIDDEN@
 #  define EOVERFLOW @EOVERFLOW_VALUE@
 #  define GNULIB_defined_EOVERFLOW 1
 # endif
 /* On OpenBSD 4.0 and on native Windows, the macros ENOMSG, EIDRM, ENOLINK,
   EPROTO, EMULTIHOP, EBADMSG, EOVERFLOW, ENOTSUP, ECANCELED are not defined.
   Define them here.  Values >= 2000 seem safe to use: Solaris ESTALE = 151,
   HP-UX EWOULDBLOCK = 246, IRIX EDQUOT = 1133.
   Note: When one of these systems defines some of these macros some day,
   binaries will have to be recompiled so that they recognizes the new
   errno values from the system.  */
 # ifndef ENOMSG
 #  define ENOMSG    2000
 #  define GNULIB_defined_ENOMSG 1
 # endif
 # ifndef EIDRM
 #  define EIDRM     2001
 #  define GNULIB_defined_EIDRM 1
 # endif
 # ifndef ENOLINK
 #  define ENOLINK   2002
 #  define GNULIB_defined_ENOLINK 1
 # endif
 # ifndef EPROTO
 #  define EPROTO    2003
 #  define GNULIB_defined_EPROTO 1
 # endif
 # ifndef EMULTIHOP
 #  define EMULTIHOP 2004
 #  define GNULIB_defined_EMULTIHOP 1
 # endif
 # ifndef EBADMSG
 #  define EBADMSG   2005
 #  define GNULIB_defined_EBADMSG 1
 # endif
 # ifndef EOVERFLOW
 #  define EOVERFLOW 2006
 #  define GNULIB_defined_EOVERFLOW 1
 # endif
 # ifndef ENOTSUP
 #  define ENOTSUP   2007
 #  define GNULIB_defined_ENOTSUP 1
 # endif
 # ifndef ECANCELED
 #  define ECANCELED 2008
 #  define GNULIB_defined_ECANCELED 1
 # endif
 #endif /* _GL_ERRNO_H */
 #endif /* _GL_ERRNO_H */
--- a/gl/fcntl.in.h
+++ b/gl/fcntl.in.h
@ -0,0 +1,144 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
   Copyright (C) 2006-2008 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
   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/>.  */
 /* written by Paul Eggert */
 #if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
 #endif
 #if defined __need_system_fcntl_h
 /* Special invocation convention.  */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
 #else
 /* Normal invocation convention.  */
 #ifndef _GL_FCNTL_H
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_FCNTL_H@
 #ifndef _GL_FCNTL_H
 #define _GL_FCNTL_H
 /* Declare overridden functions.  */
 #ifdef __cplusplus
 extern "C" {
 #endif
 #if @GNULIB_OPEN@
 # if @REPLACE_OPEN@
 #  undef open
 #  define open rpl_open
 extern int open (const char *filename, int flags, ...);
 # endif
 #endif
 #ifdef FCHDIR_REPLACEMENT
 /* gnulib internal function.  */
 extern void _gl_register_fd (int fd, const char *filename);
 #endif
 #ifdef __cplusplus
 }
 #endif
 /* Fix up the O_* macros.  */
 #if !defined O_DIRECT && defined O_DIRECTIO
 /* Tru64 spells it `O_DIRECTIO'.  */
 # define O_DIRECT O_DIRECTIO
 #endif
 #ifndef O_DIRECT
 # define O_DIRECT 0
 #endif
 #ifndef O_DIRECTORY
 # define O_DIRECTORY 0
 #endif
 #ifndef O_DSYNC
 # define O_DSYNC 0
 #endif
 #ifndef O_NDELAY
 # define O_NDELAY 0
 #endif
 #ifndef O_NOATIME
 # define O_NOATIME 0
 #endif
 #ifndef O_NONBLOCK
 # define O_NONBLOCK O_NDELAY
 #endif
 #ifndef O_NOCTTY
 # define O_NOCTTY 0
 #endif
 #ifndef O_NOFOLLOW
 # define O_NOFOLLOW 0
 #endif
 #ifndef O_NOLINKS
 # define O_NOLINKS 0
 #endif
 #ifndef O_RSYNC
 # define O_RSYNC 0
 #endif
 #ifndef O_SYNC
 # define O_SYNC 0
 #endif
 /* For systems that distinguish between text and binary I/O.
   O_BINARY is usually declared in fcntl.h  */
 #if !defined O_BINARY && defined _O_BINARY
  /* For MSC-compatible compilers.  */
 # define O_BINARY _O_BINARY
 # define O_TEXT _O_TEXT
 #endif
 #if defined __BEOS__ || defined __HAIKU__
  /* BeOS 5 and Haiku have O_BINARY and O_TEXT, but they have no effect.  */
 # undef O_BINARY
 # undef O_TEXT
 #endif
 #ifndef O_BINARY
 # define O_BINARY 0
 # define O_TEXT 0
 #endif
 #endif /* _GL_FCNTL_H */
 #endif /* _GL_FCNTL_H */
 #endif
--- a/gl/fd-safer.c
+++ b/gl/fd-safer.c
@ -1,6 +1,6 @@
 /* Return a safer copy of a file descriptor.
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2009 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
@ -24,12 +24,6 @@
 #include <errno.h>
 #include <unistd.h>
 #ifndef STDIN_FILENO
 # define STDIN_FILENO 0
 #endif
 #ifndef STDERR_FILENO
 # define STDERR_FILENO 2
 #endif
 /* Return FD, unless FD would be a copy of standard input, output, or
   error; in that case, return a duplicate of FD, closing FD.  On
--- a/gl/float.in.h
+++ b/gl/float.in.h
@ -1,6 +1,6 @@
 /* A correct <float.h>.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008 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
@ -17,6 +17,10 @@
 #ifndef _GL_FLOAT_H
 #if __GNUC__ >= 3
@PRAGMA_SYSTEM_HEADER@
 #endif
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_FLOAT_H@
--- a/gl/fsusage.c
+++ b/gl/fsusage.c
@ -1,6 +1,6 @@
 /* fsusage.c -- return space usage of mounted file systems
-   Copyright (C) 1991, 1992, 1996, 1998, 1999, 2002, 2003, 2004, 2005, 2006
+   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009
   Free Software Foundation, Inc.
   This program is free software: you can redistribute it and/or modify
@ -232,6 +232,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
 #endif
  (void) disk;  /* avoid argument-unused warning */
  return 0;
 }
--- a/gl/gai_strerror.c
+++ b/gl/gai_strerror.c
@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
   This file is part of the GNU C Library.
   Contributed by Philip Blundell <pjb27@cam.ac.uk>, 1997.
@ -18,13 +18,10 @@
 #ifndef _LIBC
 # include <config.h>
 # include "getaddrinfo.h"
 #endif
 #include <stdio.h>
-#ifdef HAVE_NETDB_H
+#include <netdb.h>
 # include <netdb.h>
 #endif
 #ifdef _LIBC
 # include <libintl.h>
@ -53,7 +50,7 @@ values[] =
    { EAI_SOCKTYPE, N_("ai_socktype not supported") },
    { EAI_SYSTEM, N_("System error") },
    { EAI_OVERFLOW, N_("Argument buffer too small") },
-#ifdef __USE_GNU
+#ifdef EAI_INPROGRESS
    { EAI_INPROGRESS, N_("Processing request in progress") },
    { EAI_CANCELED, N_("Request canceled") },
    { EAI_NOTCANCELED, N_("Request not canceled") },
--- a/gl/getaddrinfo.c
+++ b/gl/getaddrinfo.c
@ -1,5 +1,5 @@
 /* Get address information (partial implementation).
-   Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006, 2007 Free Software
+   Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006, 2007, 2008 Free Software
   Foundation, Inc.
   Contributed by Simon Josefsson <simon@josefsson.org>.
@ -19,12 +19,15 @@
 #include <config.h>
-#include "getaddrinfo.h"
+#include <netdb.h>
 #if HAVE_NETINET_IN_H
 # include <netinet/in.h>
 #endif
 /* Get inet_ntop.  */
 #include <arpa/inet.h>
 /* Get calloc. */
 #include <stdlib.h>
@ -40,8 +43,6 @@
 #define _(String) gettext (String)
 #define N_(String) String
 #include "inet_ntop.h"
 /* BeOS has AF_INET, but not PF_INET.  */
 #ifndef PF_INET
 # define PF_INET AF_INET
@ -300,6 +301,22 @@ getaddrinfo (const char *restrict nodename,
  tmp->ai_addr->sa_family = he->h_addrtype;
  tmp->ai_family = he->h_addrtype;
 #ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
  switch (he->h_addrtype)
    {
 #if HAVE_IPV4
    case AF_INET:
      tmp->ai_addr->sa_len = sizeof (struct sockaddr_in);
      break;
 #endif
 #if HAVE_IPV6
    case AF_INET6:
      tmp->ai_addr->sa_len = sizeof (struct sockaddr_in6);
      break;
 #endif
    }
 #endif
  /* FIXME: If more than one address, create linked list of addrinfo's. */
  *res = tmp;
@ -326,7 +343,7 @@ freeaddrinfo (struct addrinfo *ai)
      cur = ai;
      ai = ai->ai_next;
-      if (cur->ai_canonname) free (cur->ai_canonname);
+      free (cur->ai_canonname);
      free (cur);
    }
 }
--- a/gl/getaddrinfo.h
+++ b/gl/getaddrinfo.h
@ -1,155 +0,0 @@
 /* Get address information.
   Copyright (C) 1996-2002, 2003, 2004, 2005, 2006
                 Free Software Foundation, Inc.
   Contributed by Simon Josefsson <simon@josefsson.org>.
   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, 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.  */
 #ifndef GETADDRINFO_H
 #define GETADDRINFO_H
 /* sys/socket.h in i386-unknown-freebsd4.10 and
   powerpc-apple-darwin5.5 require sys/types.h, so include it first.
   Then we'll also get 'socklen_t' and 'struct sockaddr' which are
   used below. */
 #include <sys/types.h>
 /* Get all getaddrinfo related declarations, if available.  */
 #include <sys/socket.h>
 #ifdef HAVE_NETDB_H
 # include <netdb.h>
 #endif
 #ifndef HAVE_STRUCT_ADDRINFO
 /* Structure to contain information about address of a service provider.  */
 struct addrinfo
 {
  int ai_flags;			/* Input flags.  */
  int ai_family;		/* Protocol family for socket.  */
  int ai_socktype;		/* Socket type.  */
  int ai_protocol;		/* Protocol for socket.  */
  socklen_t ai_addrlen;		/* Length of socket address.  */
  struct sockaddr *ai_addr;	/* Socket address for socket.  */
  char *ai_canonname;		/* Canonical name for service location.  */
  struct addrinfo *ai_next;	/* Pointer to next in list.  */
 };
 #endif
 /* Possible values for `ai_flags' field in `addrinfo' structure.  */
 #ifndef AI_PASSIVE
 # define AI_PASSIVE	0x0001	/* Socket address is intended for `bind'.  */
 #endif
 #ifndef AI_CANONNAME
 # define AI_CANONNAME	0x0002	/* Request for canonical name.  */
 #endif
 #ifndef AI_NUMERICSERV
 # define AI_NUMERICSERV	0x0400	/* Don't use name resolution.  */
 #endif
 #if 0
 /* The commented out definitions below are not yet implemented in the
   GNULIB getaddrinfo() replacement, so are not yet needed and may, in fact,
   cause conflicts on systems with a getaddrinfo() function which does not
   define them.
   If they are restored, be sure to protect the definitions with #ifndef.  */
 #define AI_NUMERICHOST	0x0004	/* Don't use name resolution.  */
 #define AI_V4MAPPED	0x0008	/* IPv4 mapped addresses are acceptable.  */
 #define AI_ALL		0x0010	/* Return IPv4 mapped and IPv6 addresses.  */
 #define AI_ADDRCONFIG	0x0020	/* Use configuration of this host to choose
 				   returned address type..  */
 #endif /* 0 */
 /* Error values for `getaddrinfo' function.  */
 #ifndef EAI_BADFLAGS
 # define EAI_BADFLAGS	  -1	/* Invalid value for `ai_flags' field.  */
 # define EAI_NONAME	  -2	/* NAME or SERVICE is unknown.  */
 # define EAI_AGAIN	  -3	/* Temporary failure in name resolution.  */
 # define EAI_FAIL	  -4	/* Non-recoverable failure in name res.  */
 # define EAI_NODATA	  -5	/* No address associated with NAME.  */
 # define EAI_FAMILY	  -6	/* `ai_family' not supported.  */
 # define EAI_SOCKTYPE	  -7	/* `ai_socktype' not supported.  */
 # define EAI_SERVICE	  -8	/* SERVICE not supported for `ai_socktype'.  */
 # define EAI_MEMORY	  -10	/* Memory allocation failure.  */
 #endif
 #ifndef EAI_OVERFLOW
 /* Not defined on mingw32. */
 # define EAI_OVERFLOW	  -12	/* Argument buffer overflow.  */
 #endif
 #ifndef EAI_ADDRFAMILY
 /* Not defined on mingw32. */
 # define EAI_ADDRFAMILY  -9	/* Address family for NAME not supported.  */
 #endif
 #ifndef EAI_SYSTEM
 /* Not defined on mingw32. */
 # define EAI_SYSTEM	  -11	/* System error returned in `errno'.  */
 #endif
 #ifdef __USE_GNU
 # ifndef EAI_INPROGRESS
 #  define EAI_INPROGRESS	-100	/* Processing request in progress.  */
 #  define EAI_CANCELED		-101	/* Request canceled.  */
 #  define EAI_NOTCANCELED	-102	/* Request not canceled.  */
 #  define EAI_ALLDONE		-103	/* All requests done.  */
 #  define EAI_INTR		-104	/* Interrupted by a signal.  */
 #  define EAI_IDN_ENCODE	-105	/* IDN encoding failed.  */
 # endif
 #endif
 #if !HAVE_DECL_GETADDRINFO
 /* Translate name of a service location and/or a service name to set of
   socket addresses.
   For more details, see the POSIX:2001 specification
   <http://www.opengroup.org/susv3xsh/getaddrinfo.html>.  */
 extern int getaddrinfo (const char *restrict nodename,
 			const char *restrict servname,
 			const struct addrinfo *restrict hints,
 			struct addrinfo **restrict res);
 #endif
 #if !HAVE_DECL_FREEADDRINFO
 /* Free `addrinfo' structure AI including associated storage.
   For more details, see the POSIX:2001 specification
   <http://www.opengroup.org/susv3xsh/getaddrinfo.html>.  */
 extern void freeaddrinfo (struct addrinfo *ai);
 #endif
 #if !HAVE_DECL_GAI_STRERROR
 /* Convert error return from getaddrinfo() to a string.
   For more details, see the POSIX:2001 specification
   <http://www.opengroup.org/susv3xsh/gai_strerror.html>.  */
 extern const char *gai_strerror (int ecode);
 #endif
 #if !HAVE_DECL_GETNAMEINFO
 /* Convert socket address to printable node and service names.
   For more details, see the POSIX:2001 specification
   <http://www.opengroup.org/susv3xsh/getnameinfo.html>.  */
 extern int getnameinfo(const struct sockaddr *restrict sa, socklen_t salen,
 		       char *restrict node, socklen_t nodelen,
 		       char *restrict service, socklen_t servicelen,
 		       int flags);
 #endif
 /* Possible flags for getnameinfo.  */
 #ifndef NI_NUMERICHOST
 # define NI_NUMERICHOST 1
 #endif
 #ifndef NI_NUMERICSERV
 # define NI_NUMERICSERV 2
 #endif
 #endif /* GETADDRINFO_H */
--- a/gl/gethostname.c
+++ b/gl/gethostname.c
@ -19,6 +19,9 @@
 #include <config.h>
 /* Specification.  */
 #include <unistd.h>
 #ifdef HAVE_UNAME
 # include <sys/utsname.h>
 #endif
--- a/gl/getloadavg.c
+++ b/gl/getloadavg.c
@ -1,8 +1,8 @@
 /* Get the system load averages.
   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994,
-   1995, 1997, 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+   1995, 1997, 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free
-   Foundation, Inc.
+   Software Foundation, Inc.
   NOTE: The canonical source of this file is maintained with gnulib.
   Bugs can be reported to bug-gnulib@gnu.org.
@ -89,9 +89,11 @@
 # include <stdbool.h>
 #endif
 /* Specification.  */
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 /* Exclude all the code except the test program at the end
   if the system has its own `getloadavg' function.  */
@ -407,6 +409,7 @@
 # endif /* LOAD_AVE_TYPE */
 # if defined HAVE_LIBPERFSTAT
 #  include <sys/protosw.h>
 #  include <libperfstat.h>
 #  include <sys/proc.h>
 #  ifndef SBITS
@ -618,8 +621,11 @@ getloadavg (double loadavg[], int nelem)
  for (elem = 0; elem < nelem; elem++)
    {
      char *endptr;
-      double d = c_strtod (ptr, &endptr);
+      double d;
-      if (ptr == endptr)
+
      errno = 0;
      d = c_strtod (ptr, &endptr);
      if (ptr == endptr || (d == 0 && errno != 0))
 	{
 	  if (elem == 0)
 	    return -1;
--- a/gl/getopt.c
+++ b/gl/getopt.c
@ -2,7 +2,7 @@
   NOTE: getopt is now 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,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006
+   Copyright (C) 1987,88,89,90,91,92,93,94,95,96,98,99,2000,2001,2002,2003,2004,2006,2008
 	Free Software Foundation, Inc.
   This file is part of the GNU C Library.
@ -30,10 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 #ifdef __VMS
 # include <unixlib.h>
 #endif
 #ifdef _LIBC
 # include <libintl.h>
 #else
--- 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,88,89,90,91,92,93,94,96,97,98,2004,2006
+   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004,2006,2009
     Free Software Foundation, Inc.
   This file is part of the GNU C Library.
@ -91,7 +91,7 @@ main (int argc, char **argv)
    {
      int this_option_optind = optind ? optind : 1;
      int option_index = 0;
-      static struct option long_options[] =
+      static const struct option long_options[] =
      {
 	{"add", 1, 0, 0},
 	{"append", 0, 0, 0},
--- 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 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 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
@ -63,21 +63,30 @@
   for invalid uses of the value returned from these functions.
   On pre-ANSI systems without 'const', the config.h file is supposed to
   contain "#define const".  */
 # undef gettext
 # define gettext(Msgid) ((const char *) (Msgid))
 # undef dgettext
 # define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
 # undef dcgettext
 # define dcgettext(Domainname, Msgid, Category) \
    ((void) (Category), dgettext (Domainname, Msgid))
 # undef ngettext
 # define ngettext(Msgid1, Msgid2, N) \
    ((N) == 1 \
     ? ((void) (Msgid2), (const char *) (Msgid1)) \
     : ((void) (Msgid1), (const char *) (Msgid2)))
 # undef dngettext
 # define dngettext(Domainname, Msgid1, Msgid2, N) \
    ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
 # undef dcngettext
 # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
    ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
 # undef textdomain
 # define textdomain(Domainname) ((const char *) (Domainname))
 # undef bindtextdomain
 # define bindtextdomain(Domainname, Dirname) \
    ((void) (Domainname), (const char *) (Dirname))
 # undef bind_textdomain_codeset
 # define bind_textdomain_codeset(Domainname, Codeset) \
    ((void) (Domainname), (const char *) (Codeset))
--- a/gl/inet_ntop.c
+++ b/gl/inet_ntop.c
@ -1,6 +1,6 @@
 /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
-   Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2008  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
@ -36,7 +36,7 @@
 #include <config.h>
 /* Specification.  */
-#include "inet_ntop.h"
+#include <arpa/inet.h>
 #include <stdio.h>
 #include <string.h>
--- a/gl/localcharset.c
+++ b/gl/localcharset.c
@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2006 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2009 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
@ -28,13 +28,19 @@
 #include <string.h>
 #include <stdlib.h>
 #if defined __APPLE__ && defined __MACH__ && HAVE_LANGINFO_CODESET
 # define DARWIN7 /* Darwin 7 or newer, i.e. MacOS X 10.3 or newer */
 #endif
 #if defined _WIN32 || defined __WIN32__
 # define WIN32_NATIVE
 #endif
 #if defined __EMX__
 /* Assume EMX program runs on OS/2, even if compiled under DOS.  */
-# define OS2
+# ifndef OS2
 #  define OS2
 # endif
 #endif
 #if !defined WIN32_NATIVE
@ -110,7 +116,7 @@ get_charset_aliases (void)
  cp = charset_aliases;
  if (cp == NULL)
    {
-#if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
+#if !(defined DARWIN7 || defined VMS || defined WIN32_NATIVE || defined __CYGWIN__)
      FILE *fp;
      const char *dir;
      const char *base = "charset.alias";
@ -211,6 +217,39 @@ get_charset_aliases (void)
 #else
 # if defined DARWIN7
      /* To avoid the trouble of installing a file that is shared by many
 	 GNU packages -- many packaging systems have problems with this --,
 	 simply inline the aliases here.  */
      cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
 	   "ISO8859-2" "\0" "ISO-8859-2" "\0"
 	   "ISO8859-4" "\0" "ISO-8859-4" "\0"
 	   "ISO8859-5" "\0" "ISO-8859-5" "\0"
 	   "ISO8859-7" "\0" "ISO-8859-7" "\0"
 	   "ISO8859-9" "\0" "ISO-8859-9" "\0"
 	   "ISO8859-13" "\0" "ISO-8859-13" "\0"
 	   "ISO8859-15" "\0" "ISO-8859-15" "\0"
 	   "KOI8-R" "\0" "KOI8-R" "\0"
 	   "KOI8-U" "\0" "KOI8-U" "\0"
 	   "CP866" "\0" "CP866" "\0"
 	   "CP949" "\0" "CP949" "\0"
 	   "CP1131" "\0" "CP1131" "\0"
 	   "CP1251" "\0" "CP1251" "\0"
 	   "eucCN" "\0" "GB2312" "\0"
 	   "GB2312" "\0" "GB2312" "\0"
 	   "eucJP" "\0" "EUC-JP" "\0"
 	   "eucKR" "\0" "EUC-KR" "\0"
 	   "Big5" "\0" "BIG5" "\0"
 	   "Big5HKSCS" "\0" "BIG5-HKSCS" "\0"
 	   "GBK" "\0" "GBK" "\0"
 	   "GB18030" "\0" "GB18030" "\0"
 	   "SJIS" "\0" "SHIFT_JIS" "\0"
 	   "ARMSCII-8" "\0" "ARMSCII-8" "\0"
 	   "PT154" "\0" "PT154" "\0"
 	 /*"ISCII-DEV" "\0" "?" "\0"*/
 	   "*" "\0" "UTF-8" "\0";
 # endif
 # if defined VMS
      /* To avoid the troubles of an extra file charset.alias_vms in the
 	 sources of many GNU packages, simply inline the aliases here.  */
--- a/gl/m4/00gnulib.m4
+++ b/gl/m4/00gnulib.m4
@ -0,0 +1,30 @@
 # 00gnulib.m4 serial 2
 dnl Copyright (C) 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl This file must be named something that sorts before all other
 dnl gnulib-provided .m4 files.  It is needed until such time as we can
 dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics.
 # AC_DEFUN_ONCE([NAME], VALUE)
 # ----------------------------
 # Define NAME to expand to VALUE on the first use (whether by direct
 # expansion, or by AC_REQUIRE), and to nothing on all subsequent uses.
 # Avoid bugs in AC_REQUIRE in Autoconf 2.63 and earlier.  This
 # definition is slower than the version in Autoconf 2.64, because it
 # can only use interfaces that existed since 2.59; but it achieves the
 # same effect.  Quoting is necessary to avoid confusing Automake.
 m4_version_prereq([2.63.263], [],
 [m4_define([AC][_DEFUN_ONCE],
  [AC][_DEFUN([$1],
    [AC_REQUIRE([_gl_DEFUN_ONCE([$1])],
      [m4_indir([_gl_DEFUN_ONCE([$1])])])])]dnl
 [AC][_DEFUN([_gl_DEFUN_ONCE([$1])], [$2])])])
 # gl_00GNULIB
 # -----------
 # Witness macro that this file has been included.  Needed to force
 # Automake to include this file prior to all other gnulib .m4 files.
 AC_DEFUN([gl_00GNULIB])
--- a/gl/m4/alloca.m4
+++ b/gl/m4/alloca.m4
@ -1,5 +1,5 @@
-# alloca.m4 serial 8
+# alloca.m4 serial 9
-dnl Copyright (C) 2002-2004, 2006, 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2006, 2007, 2009 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.
@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_ALLOCA],
    ])
    if test $gl_cv_rpl_alloca = yes; then
      dnl OK, alloca can be implemented through a compiler built-in.
-      AC_DEFINE([HAVE_ALLOCA], 1,
+      AC_DEFINE([HAVE_ALLOCA], [1],
        [Define to 1 if you have 'alloca' after including <alloca.h>,
         a header that may be supplied by this distribution.])
      ALLOCA_H=alloca.h
--- a/gl/m4/arpa_inet_h.m4
+++ b/gl/m4/arpa_inet_h.m4
@ -1,18 +1,50 @@
-# arpa_inet_h.m4 serial 1
+# arpa_inet_h.m4 serial 5
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
-dnl Written by Simon Josefsson
+dnl Written by Simon Josefsson and Bruno Haible
 AC_DEFUN([gl_HEADER_ARPA_INET],
 [
  dnl Use AC_REQUIRE here, so that the default behavior below is expanded
  dnl once only, before all statements that occur in other macros.
  AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
  AC_CHECK_HEADERS_ONCE([arpa/inet.h])
  if test $ac_cv_header_arpa_inet_h = yes; then
-    ARPA_INET_H=''
+    HAVE_ARPA_INET_H=1
  else
    ARPA_INET_H='arpa/inet.h'
    HAVE_ARPA_INET_H=0
  fi
-  AC_SUBST(ARPA_INET_H)
+  AC_SUBST([HAVE_ARPA_INET_H])
  dnl Execute this unconditionally, because ARPA_INET_H may be set by other
  dnl modules, after this code is executed.
  gl_CHECK_NEXT_HEADERS([arpa/inet.h])
 ])
 dnl Unconditionally enables the replacement of <arpa/inet.h>.
 AC_DEFUN([gl_REPLACE_ARPA_INET_H],
 [
  AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
  ARPA_INET_H='arpa/inet.h'
 ])
 AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR],
 [
  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
  AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
 ])
 AC_DEFUN([gl_ARPA_INET_H_DEFAULTS],
 [
  GNULIB_INET_NTOP=0;     AC_SUBST([GNULIB_INET_NTOP])
  GNULIB_INET_PTON=0;     AC_SUBST([GNULIB_INET_PTON])
  dnl Assume proper GNU behavior unless another module says otherwise.
  HAVE_DECL_INET_NTOP=1;  AC_SUBST([HAVE_DECL_INET_NTOP])
  HAVE_DECL_INET_PTON=1;  AC_SUBST([HAVE_DECL_INET_PTON])
  ARPA_INET_H='';         AC_SUBST([ARPA_INET_H])
 ])
--- a/gl/m4/btowc.m4
+++ b/gl/m4/btowc.m4
@ -0,0 +1,68 @@
 # btowc.m4 serial 4
 dnl Copyright (C) 2008-2009 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.
 AC_DEFUN([gl_FUNC_BTOWC],
 [
  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
  AC_CHECK_FUNCS_ONCE([btowc])
  if test $ac_cv_func_btowc = no; then
    HAVE_BTOWC=0
  else
    dnl IRIX 6.5 btowc(EOF) is 0xFF, not WEOF.
    AC_REQUIRE([AC_PROG_CC])
    AC_REQUIRE([gt_LOCALE_FR])
    AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
    AC_CACHE_CHECK([whether btowc(EOF) is correct],
      [gl_cv_func_btowc_eof],
      [
        dnl Initial guess, used when cross-compiling or when no suitable locale
        dnl is present.
 changequote(,)dnl
        case "$host_os" in
                 # Guess no on IRIX.
          irix*) gl_cv_func_btowc_eof="guessing no" ;;
                 # Guess yes otherwise.
          *)     gl_cv_func_btowc_eof="guessing yes" ;;
        esac
 changequote([,])dnl
        if test $LOCALE_FR != none; then
          AC_TRY_RUN([
 #include <locale.h>
 #include <stdio.h>
 #include <string.h>
 #include <wchar.h>
 int main ()
 {
  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
    {
      if (btowc (EOF) != WEOF)
        return 1;
    }
  return 0;
 }],
            [gl_cv_func_btowc_eof=yes],
            [gl_cv_func_btowc_eof=no],
            [:])
        fi
      ])
    case "$gl_cv_func_btowc_eof" in
      *yes) ;;
      *) REPLACE_BTOWC=1 ;;
    esac
  fi
  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
    gl_REPLACE_WCHAR_H
    AC_LIBOBJ([btowc])
    gl_PREREQ_BTOWC
  fi
 ])
 # Prerequisites of lib/btowc.c.
 AC_DEFUN([gl_PREREQ_BTOWC], [
  :
 ])
--- a/gl/m4/c-strtod.m4
+++ b/gl/m4/c-strtod.m4
@ -1,6 +1,6 @@
-# c-strtod.m4 serial 9
+# c-strtod.m4 serial 11
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2009 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.
@ -29,7 +29,7 @@ AC_DEFUN([gl_C99_STRTOLD],
       [gl_cv_func_c99_strtold=yes],
       [gl_cv_func_c99_strtold=no])])
  if test $gl_cv_func_c99_strtold = yes; then
-    AC_DEFINE([HAVE_C99_STRTOLD], 1, [Define to 1 if strtold conforms to C99.])
+    AC_DEFINE([HAVE_C99_STRTOLD], [1], [Define to 1 if strtold conforms to C99.])
  fi
 ])
@ -39,6 +39,8 @@ AC_DEFUN([gl_C_STRTOD],
  dnl Prerequisites of lib/c-strtod.c.
  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
  AC_REQUIRE([AC_C_INLINE])
  :
 ])
@ -49,5 +51,7 @@ AC_DEFUN([gl_C_STRTOLD],
  dnl Prerequisites of lib/c-strtold.c.
  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
  AC_REQUIRE([gl_C99_STRTOLD])
  AC_REQUIRE([AC_C_INLINE])
  :
 ])
--- a/gl/m4/codeset.m4
+++ b/gl/m4/codeset.m4
@ -1,5 +1,5 @@
-# codeset.m4 serial 2 (gettext-0.16)
+# codeset.m4 serial 4 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008, 2009 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.
@ -8,14 +8,14 @@ dnl From Bruno Haible.
 AC_DEFUN([AM_LANGINFO_CODESET],
 [
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
    [AC_TRY_LINK([#include <langinfo.h>],
      [char* cs = nl_langinfo(CODESET); return !cs;],
-      am_cv_langinfo_codeset=yes,
+      [am_cv_langinfo_codeset=yes],
-      am_cv_langinfo_codeset=no)
+      [am_cv_langinfo_codeset=no])
    ])
  if test $am_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
  fi
 ])
--- a/gl/m4/double-slash-root.m4
+++ b/gl/m4/double-slash-root.m4
@ -1,5 +1,5 @@
-# double-slash-root.m4 serial 2   -*- Autoconf -*-
+# double-slash-root.m4 serial 4   -*- Autoconf -*-
-dnl Copyright (C) 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008, 2009 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,15 +24,15 @@ AC_DEFUN([gl_DOUBLE_SLASH_ROOT],
 	    gl_cv_double_slash_root='unknown, assuming no' ;;
 	esac
      else
-	set x `ls -di / //`
+	set x `ls -di / // 2>/dev/null`
-	if test $[2] = $[4] && wc //dev/null >/dev/null 2>&1; then
+	if test "$[2]" = "$[4]" && wc //dev/null >/dev/null 2>&1; then
 	  gl_cv_double_slash_root=no
 	else
 	  gl_cv_double_slash_root=yes
 	fi
      fi])
  if test "$gl_cv_double_slash_root" = yes; then
-    AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], 1,
+    AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], [1],
      [Define to 1 if // is a file system root distinct from /.])
  fi
 ])
--- a/gl/m4/eoverflow.m4
+++ b/gl/m4/eoverflow.m4
@ -1,70 +0,0 @@
 # eoverflow.m4 serial 2
 dnl Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl From Bruno Haible.
 # The EOVERFLOW errno value ought to be defined in <errno.h>, according to
 # POSIX.  But some systems (like AIX 3) don't define it, and some systems
 # (like OSF/1) define it when _XOPEN_SOURCE_EXTENDED is defined.
 # Define EOVERFLOW as a C macro and as a substituted macro in such a way that
 # 1. on all systems, after inclusion of <errno.h>, EOVERFLOW is usable,
 # 2. on systems where EOVERFLOW is defined elsewhere, we use the same numeric
 #    value.
 AC_DEFUN([gl_EOVERFLOW],
 [
  AC_REQUIRE([AC_PROG_CC])dnl
  AC_CACHE_CHECK([for EOVERFLOW], ac_cv_decl_EOVERFLOW, [
    AC_EGREP_CPP(yes,[
 #include <errno.h>
 #ifdef EOVERFLOW
 yes
 #endif
      ], have_eoverflow=1)
    if test -n "$have_eoverflow"; then
      dnl EOVERFLOW exists in <errno.h>. Don't need to define EOVERFLOW ourselves.
      ac_cv_decl_EOVERFLOW=yes
    else
      AC_EGREP_CPP(yes,[
 #define _XOPEN_SOURCE_EXTENDED 1
 #include <errno.h>
 #ifdef EOVERFLOW
 yes
 #endif
        ], have_eoverflow=1)
      if test -n "$have_eoverflow"; then
        dnl EOVERFLOW exists but is hidden.
        dnl Define it to the same value.
        AC_COMPUTE_INT([ac_cv_decl_EOVERFLOW], [EOVERFLOW], [
 #define _XOPEN_SOURCE_EXTENDED 1
 #include <errno.h>
 /* The following two lines are a workaround against an autoconf-2.52 bug.  */
 #include <stdio.h>
 #include <stdlib.h>
 ])
      else
        dnl EOVERFLOW isn't defined by the system. Define EOVERFLOW ourselves, but
        dnl don't define it as EINVAL, because snprintf() callers want to
        dnl distinguish EINVAL and EOVERFLOW.
        ac_cv_decl_EOVERFLOW=E2BIG
      fi
    fi
  ])
  if test "$ac_cv_decl_EOVERFLOW" != yes; then
    AC_DEFINE_UNQUOTED([EOVERFLOW], [$ac_cv_decl_EOVERFLOW],
                       [Define as good substitute value for EOVERFLOW.])
    EOVERFLOW="$ac_cv_decl_EOVERFLOW"
    AC_SUBST(EOVERFLOW)
  fi
 ])
 dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
 dnl Remove this when we can assume autoconf >= 2.61.
 m4_ifdef([AC_COMPUTE_INT], [], [
  AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
 ])
--- a/gl/m4/errno_h.m4
+++ b/gl/m4/errno_h.m4
@ -0,0 +1,112 @@
 # errno_h.m4 serial 5
 dnl Copyright (C) 2004, 2006, 2008, 2009 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.
 AC_DEFUN_ONCE([gl_HEADER_ERRNO_H],
 [
  AC_REQUIRE([AC_PROG_CC])
  AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [
    AC_EGREP_CPP([booboo],[
 #include <errno.h>
 #if !defined ENOMSG
 booboo
 #endif
 #if !defined EIDRM
 booboo
 #endif
 #if !defined ENOLINK
 booboo
 #endif
 #if !defined EPROTO
 booboo
 #endif
 #if !defined EMULTIHOP
 booboo
 #endif
 #if !defined EBADMSG
 booboo
 #endif
 #if !defined EOVERFLOW
 booboo
 #endif
 #if !defined ENOTSUP
 booboo
 #endif
 #if !defined ECANCELED
 booboo
 #endif
      ],
      [gl_cv_header_errno_h_complete=no],
      [gl_cv_header_errno_h_complete=yes])
  ])
  if test $gl_cv_header_errno_h_complete = yes; then
    ERRNO_H=''
  else
    gl_CHECK_NEXT_HEADERS([errno.h])
    ERRNO_H='errno.h'
  fi
  AC_SUBST([ERRNO_H])
  gl_REPLACE_ERRNO_VALUE([EMULTIHOP])
  gl_REPLACE_ERRNO_VALUE([ENOLINK])
  gl_REPLACE_ERRNO_VALUE([EOVERFLOW])
 ])
 # Assuming $1 = EOVERFLOW.
 # The EOVERFLOW errno value ought to be defined in <errno.h>, according to
 # POSIX.  But some systems (like OpenBSD 4.0 or AIX 3) don't define it, and
 # some systems (like OSF/1) define it when _XOPEN_SOURCE_EXTENDED is defined.
 # Check for the value of EOVERFLOW.
 # Set the variables EOVERFLOW_HIDDEN and EOVERFLOW_VALUE.
 AC_DEFUN([gl_REPLACE_ERRNO_VALUE],
 [
  if test -n "$ERRNO_H"; then
    AC_CACHE_CHECK([for ]$1[ value], [gl_cv_header_errno_h_]$1, [
      AC_EGREP_CPP([yes],[
 #include <errno.h>
 #ifdef ]$1[
 yes
 #endif
      ],
      [gl_cv_header_errno_h_]$1[=yes],
      [gl_cv_header_errno_h_]$1[=no])
      if test $gl_cv_header_errno_h_]$1[ = no; then
        AC_EGREP_CPP([yes],[
 #define _XOPEN_SOURCE_EXTENDED 1
 #include <errno.h>
 #ifdef ]$1[
 yes
 #endif
          ], [gl_cv_header_errno_h_]$1[=hidden])
        if test $gl_cv_header_errno_h_]$1[ = hidden; then
          dnl The macro exists but is hidden.
          dnl Define it to the same value.
          AC_COMPUTE_INT([gl_cv_header_errno_h_]$1, $1, [
 #define _XOPEN_SOURCE_EXTENDED 1
 #include <errno.h>
 /* The following two lines are a workaround against an autoconf-2.52 bug.  */
 #include <stdio.h>
 #include <stdlib.h>
 ])
        fi
      fi
    ])
    case $gl_cv_header_errno_h_]$1[ in
      yes | no)
        ]$1[_HIDDEN=0; ]$1[_VALUE=
        ;;
      *)
        ]$1[_HIDDEN=1; ]$1[_VALUE="$gl_cv_header_errno_h_]$1["
        ;;
    esac
    AC_SUBST($1[_HIDDEN])
    AC_SUBST($1[_VALUE])
  fi
 ])
 dnl Autoconf >= 2.61 has AC_COMPUTE_INT built-in.
 dnl Remove this when we can assume autoconf >= 2.61.
 m4_ifdef([AC_COMPUTE_INT], [], [
  AC_DEFUN([AC_COMPUTE_INT], [_AC_COMPUTE_INT([$2],[$1],[$3],[$4])])
 ])
--- a/gl/m4/extensions.m4
+++ b/gl/m4/extensions.m4
@ -1,7 +1,7 @@
-# serial 5  -*- Autoconf -*-
+# serial 8  -*- Autoconf -*-
 # Enable extensions on systems that normally disable them.
-# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006-2009 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.
@ -20,10 +20,12 @@
 # AC_DEFINE.  The goal here is to define all known feature-enabling
 # macros, then, if reports of conflicts are made, disable macros that
 # cause problems on some platforms (such as __EXTENSIONS__).
-AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
+AC_DEFUN_ONCE([AC_USE_SYSTEM_EXTENSIONS],
 [AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
 AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
  AC_REQUIRE([AC_CANONICAL_HOST])
  AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
  if test "$MINIX" = yes; then
    AC_DEFINE([_POSIX_SOURCE], [1],
@ -36,6 +38,16 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
      [Define to 1 if on MINIX.])
  fi
  dnl HP-UX 11.11 defines mbstate_t only if _XOPEN_SOURCE is defined to 500,
  dnl regardless of whether the flags -Ae or _D_HPUX_SOURCE=1 are already
  dnl provided.
  case "$host_os" in
    hpux*)
      AC_DEFINE([_XOPEN_SOURCE], [500],
        [Define to 500 only on HP-UX.])
      ;;
  esac
  AH_VERBATIM([__EXTENSIONS__],
 [/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
@ -61,9 +73,9 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
  AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
    [ac_cv_safe_to_define___extensions__],
    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM([
+       [AC_LANG_PROGRAM([[
 #	  define __EXTENSIONS__ 1
-	  AC_INCLUDES_DEFAULT])],
+	  ]AC_INCLUDES_DEFAULT])],
       [ac_cv_safe_to_define___extensions__=yes],
       [ac_cv_safe_to_define___extensions__=no])])
  test $ac_cv_safe_to_define___extensions__ = yes &&
@ -78,5 +90,15 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
 # ------------------------
 # Enable extensions on systems that normally disable them,
 # typically due to standards-conformance issues.
-AC_DEFUN([gl_USE_SYSTEM_EXTENSIONS],
+AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
-  [AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])])
+[
  dnl Require this macro before AC_USE_SYSTEM_EXTENSIONS.
  dnl gnulib does not need it. But if it gets required by third-party macros
  dnl after AC_USE_SYSTEM_EXTENSIONS is required, autoconf 2.62..2.63 emit a
  dnl warning: "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
  dnl Note: We can do this only for one of the macros AC_AIX, AC_GNU_SOURCE,
  dnl AC_MINIX. If people still use AC_AIX or AC_MINIX, they are out of luck.
  AC_REQUIRE([AC_GNU_SOURCE])
  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 ])
--- a/gl/m4/fcntl_h.m4
+++ b/gl/m4/fcntl_h.m4
@ -0,0 +1,96 @@
 # Configure fcntl.h.
 dnl Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl Written by Paul Eggert.
 AC_DEFUN([gl_FCNTL_H],
 [
  AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
  dnl Persuade glibc <fcntl.h> to define O_NOATIME and O_NOFOLLOW.
  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
  AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h],
    [AC_RUN_IFELSE(
       [AC_LANG_PROGRAM(
 	  [[#include <sys/types.h>
 	   #include <sys/stat.h>
 	   #include <unistd.h>
 	   #include <fcntl.h>
 	   #ifndef O_NOATIME
 	    #define O_NOATIME 0
 	   #endif
 	   #ifndef O_NOFOLLOW
 	    #define O_NOFOLLOW 0
 	   #endif
 	   static int const constants[] =
 	    {
 	      O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
 	      O_NONBLOCK, O_SYNC, O_ACCMODE, O_RDONLY, O_RDWR, O_WRONLY
 	    };
 	  ]],
 	  [[
 	    int status = !constants;
 	    {
 	      static char const sym[] = "conftest.sym";
 	      if (symlink (".", sym) != 0
 		  || close (open (sym, O_RDONLY | O_NOFOLLOW)) == 0)
 		status |= 32;
 	    }
 	    {
 	      static char const file[] = "confdefs.h";
 	      int fd = open (file, O_RDONLY | O_NOATIME);
 	      char c;
 	      struct stat st0, st1;
 	      if (fd < 0
 		  || fstat (fd, &st0) != 0
 		  || sleep (1) != 0
 		  || read (fd, &c, 1) != 1
 		  || close (fd) != 0
 		  || stat (file, &st1) != 0
 		  || st0.st_atime != st1.st_atime)
 		status |= 64;
 	    }
 	    return status;]])],
       [gl_cv_header_working_fcntl_h=yes],
       [case $? in #(
 	32) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
 	64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
 	96) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
 	 *) gl_cv_header_working_fcntl_h='no';;
 	esac],
       [gl_cv_header_working_fcntl_h=cross-compiling])])
  case $gl_cv_header_working_fcntl_h in #(
  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
  *) ac_val=1;;
  esac
  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
    [Define to 1 if O_NOATIME works.])
  case $gl_cv_header_working_fcntl_h in #(
  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
  *) ac_val=1;;
  esac
  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
    [Define to 1 if O_NOFOLLOW works.])
  gl_CHECK_NEXT_HEADERS([fcntl.h])
  FCNTL_H='fcntl.h'
  AC_SUBST([FCNTL_H])
 ])
 AC_DEFUN([gl_FCNTL_MODULE_INDICATOR],
 [
  dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
  AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
  GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
 ])
 AC_DEFUN([gl_FCNTL_H_DEFAULTS],
 [
  GNULIB_OPEN=0;  AC_SUBST([GNULIB_OPEN])
  dnl Assume proper GNU behavior unless another module says otherwise.
  REPLACE_OPEN=0; AC_SUBST([REPLACE_OPEN])
 ])
--- a/gl/m4/floorf.m4
+++ b/gl/m4/floorf.m4
@ -1,5 +1,5 @@
-# floorf.m4 serial 3
+# floorf.m4 serial 4
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009 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.
@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_FLOORF],
 # Sets FLOORF_LIBM.
 AC_DEFUN([gl_FUNC_FLOORF_LIBS],
 [
-  AC_CACHE_VAL([gl_cv_func_floorf_libm], [
+  gl_CACHE_VAL_SILENT([gl_cv_func_floorf_libm], [
    gl_cv_func_floorf_libm=?
    AC_TRY_LINK([
       #ifndef __NO_MATH_INLINES
--- a/gl/m4/fsusage.m4
+++ b/gl/m4/fsusage.m4
@ -1,7 +1,7 @@
-#serial 23
+# serial 24
 # Obtaining file system usage information.
-# Copyright (C) 1997, 1998, 2000, 2001, 2003-2007 Free Software Foundation, Inc.
+# Copyright (C) 1997-1998, 2000-2001, 2003-2009 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -11,16 +11,16 @@
 AC_DEFUN([gl_FSUSAGE],
 [
-  AC_CHECK_HEADERS_ONCE(sys/param.h)
+  AC_CHECK_HEADERS_ONCE([sys/param.h])
-  AC_CHECK_HEADERS_ONCE(sys/vfs.h sys/fs_types.h)
+  AC_CHECK_HEADERS_ONCE([sys/vfs.h sys/fs_types.h])
-  AC_CHECK_HEADERS(sys/mount.h, [], [],
+  AC_CHECK_HEADERS([sys/mount.h], [], [],
    [AC_INCLUDES_DEFAULT
     [#if HAVE_SYS_PARAM_H
       #include <sys/param.h>
      #endif]])
  gl_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no])
  if test $gl_cv_fs_space = yes; then
-    AC_LIBOBJ(fsusage)
+    AC_LIBOBJ([fsusage])
    gl_PREREQ_FSUSAGE_EXTRA
  fi
 ])
@ -38,21 +38,21 @@ AC_MSG_NOTICE([checking how to get file system space usage])
 ac_fsusage_space=no
 # Perform only the link test since it seems there are no variants of the
-# statvfs function.  This check is more than just AC_CHECK_FUNCS(statvfs)
+# statvfs function.  This check is more than just AC_CHECK_FUNCS([statvfs])
 # because that got a false positive on SCO OSR5.  Adding the declaration
 # of a `struct statvfs' causes this test to fail (as it should) on such
 # systems.  That system is reported to work fine with STAT_STATFS4 which
 # is what it gets when this test fails.
 if test $ac_fsusage_space = no; then
  # SVR4
-  AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
+  AC_CACHE_CHECK([for statvfs function (SVR4)], [fu_cv_sys_stat_statvfs],
 		 [AC_TRY_LINK([#include <sys/types.h>
-#if defined __GLIBC__ && !defined __BEOS__
+#if defined __GLIBC__ && defined __linux__
-Do not use statvfs on systems with GNU libc, because that function stats
+Do not use statvfs on systems with GNU libc on Linux, because that function
-all preceding entries in /proc/mounts, and that makes df hang if even
+stats all preceding entries in /proc/mounts, and that makes df hang if even
 one of the corresponding file systems is hard-mounted, but not available.
-statvfs in GNU libc on BeOS operates differently: it only makes a system
+statvfs in GNU libc on Hurd, BeOS, Haiku operates differently: it only makes
-call.
+a system call.
 #endif
 #ifdef __osf__
@ -65,7 +65,7 @@ call.
 			      fu_cv_sys_stat_statvfs=no)])
  if test $fu_cv_sys_stat_statvfs = yes; then
    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATVFS, 1,
+    AC_DEFINE([STAT_STATVFS], [1],
 	      [  Define if there is a function named statvfs.  (SVR4)])
  fi
 fi
@ -73,7 +73,7 @@ fi
 if test $ac_fsusage_space = no; then
  # DEC Alpha running OSF/1
  AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
+  AC_CACHE_VAL([fu_cv_sys_stat_statfs3_osf1],
  [AC_TRY_RUN([
 #include <sys/param.h>
 #include <sys/types.h>
@ -88,10 +88,10 @@ if test $ac_fsusage_space = no; then
  fu_cv_sys_stat_statfs3_osf1=yes,
  fu_cv_sys_stat_statfs3_osf1=no,
  fu_cv_sys_stat_statfs3_osf1=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
+  AC_MSG_RESULT([$fu_cv_sys_stat_statfs3_osf1])
  if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS3_OSF1, 1,
+    AC_DEFINE([STAT_STATFS3_OSF1], [1],
 	      [   Define if  statfs takes 3 args.  (DEC Alpha running OSF/1)])
  fi
 fi
@ -100,7 +100,7 @@ if test $ac_fsusage_space = no; then
 # AIX
  AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
 member (AIX, 4.3BSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
+  AC_CACHE_VAL([fu_cv_sys_stat_statfs2_bsize],
  [AC_TRY_RUN([
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@ -121,10 +121,10 @@ member (AIX, 4.3BSD)])
  fu_cv_sys_stat_statfs2_bsize=yes,
  fu_cv_sys_stat_statfs2_bsize=no,
  fu_cv_sys_stat_statfs2_bsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
+  AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_bsize])
  if test $fu_cv_sys_stat_statfs2_bsize = yes; then
    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS2_BSIZE, 1,
+    AC_DEFINE([STAT_STATFS2_BSIZE], [1],
 [  Define if statfs takes 2 args and struct statfs has a field named f_bsize.
   (4.3BSD, SunOS 4, HP-UX, AIX PS/2)])
  fi
@ -133,7 +133,7 @@ fi
 if test $ac_fsusage_space = no; then
 # SVR3
  AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
+  AC_CACHE_VAL([fu_cv_sys_stat_statfs4],
  [AC_TRY_RUN([#include <sys/types.h>
 #include <sys/statfs.h>
  int
@ -145,10 +145,10 @@ if test $ac_fsusage_space = no; then
    fu_cv_sys_stat_statfs4=yes,
    fu_cv_sys_stat_statfs4=no,
    fu_cv_sys_stat_statfs4=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
+  AC_MSG_RESULT([$fu_cv_sys_stat_statfs4])
  if test $fu_cv_sys_stat_statfs4 = yes; then
    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS4, 1,
+    AC_DEFINE([STAT_STATFS4], [1],
 	      [  Define if statfs takes 4 args.  (SVR3, Dynix, Irix, Dolphin)])
  fi
 fi
@ -157,7 +157,7 @@ if test $ac_fsusage_space = no; then
 # 4.4BSD and NetBSD
  AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
 member (4.4BSD and NetBSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
+  AC_CACHE_VAL([fu_cv_sys_stat_statfs2_fsize],
  [AC_TRY_RUN([#include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@ -175,10 +175,10 @@ member (4.4BSD and NetBSD)])
  fu_cv_sys_stat_statfs2_fsize=yes,
  fu_cv_sys_stat_statfs2_fsize=no,
  fu_cv_sys_stat_statfs2_fsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
+  AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_fsize])
  if test $fu_cv_sys_stat_statfs2_fsize = yes; then
    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS2_FSIZE, 1,
+    AC_DEFINE([STAT_STATFS2_FSIZE], [1],
 [  Define if statfs takes 2 args and struct statfs has a field named f_fsize.
   (4.4BSD, NetBSD)])
  fi
@ -187,7 +187,7 @@ fi
 if test $ac_fsusage_space = no; then
  # Ultrix
  AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
-  AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
+  AC_CACHE_VAL([fu_cv_sys_stat_fs_data],
  [AC_TRY_RUN([#include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
@ -209,10 +209,10 @@ if test $ac_fsusage_space = no; then
  fu_cv_sys_stat_fs_data=yes,
  fu_cv_sys_stat_fs_data=no,
  fu_cv_sys_stat_fs_data=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
+  AC_MSG_RESULT([$fu_cv_sys_stat_fs_data])
  if test $fu_cv_sys_stat_fs_data = yes; then
    ac_fsusage_space=yes
-    AC_DEFINE(STAT_STATFS2_FS_DATA, 1,
+    AC_DEFINE([STAT_STATFS2_FS_DATA], [1],
 [  Define if statfs takes 2 args and the second argument has
   type struct fs_data.  (Ultrix)])
  fi
@ -222,7 +222,7 @@ if test $ac_fsusage_space = no; then
  # SVR2
  AC_TRY_CPP([#include <sys/filsys.h>
    ],
-    AC_DEFINE(STAT_READ_FILSYS, 1,
+    AC_DEFINE([STAT_READ_FILSYS], [1],
      [Define if there is no specific function for reading file systems usage
       information and you have the <sys/filsys.h> header file.  (SVR2)])
    ac_fsusage_space=yes)
@ -239,7 +239,7 @@ AS_IF([test $ac_fsusage_space = yes], [$1], [$2])
 AC_DEFUN([gl_STATFS_TRUNCATES],
 [
  AC_MSG_CHECKING([for statfs that truncates block counts])
-  AC_CACHE_VAL(fu_cv_sys_truncating_statfs,
+  AC_CACHE_VAL([fu_cv_sys_truncating_statfs],
  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #if !defined(sun) && !defined(__sun)
 choke -- this is a workaround for a Sun-specific problem
@ -251,19 +251,19 @@ choke -- this is a workaround for a Sun-specific problem
    [fu_cv_sys_truncating_statfs=yes],
    [fu_cv_sys_truncating_statfs=no])])
  if test $fu_cv_sys_truncating_statfs = yes; then
-    AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1,
+    AC_DEFINE([STATFS_TRUNCATES_BLOCK_COUNTS], [1],
      [Define if the block counts reported by statfs may be truncated to 2GB
       and the correct values may be stored in the f_spare array.
       (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem.
       SunOS 4.1.1 seems not to be affected.)])
  fi
-  AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
+  AC_MSG_RESULT([$fu_cv_sys_truncating_statfs])
 ])
 # Prerequisites of lib/fsusage.c not done by gl_FILE_SYSTEM_USAGE.
 AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA],
 [
-  AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h)
+  AC_CHECK_HEADERS([dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h])
  gl_STATFS_TRUNCATES
 ])
--- a/gl/m4/getaddrinfo.m4
+++ b/gl/m4/getaddrinfo.m4
@ -1,5 +1,5 @@
-# getaddrinfo.m4 serial 15
+# getaddrinfo.m4 serial 20
-dnl Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2009 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.
@ -7,11 +7,23 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_GETADDRINFO],
 [
  AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H
  AC_REQUIRE([gl_HEADER_NETDB])dnl for HAVE_NETDB_H
  AC_MSG_NOTICE([checking how to do getaddrinfo, freeaddrinfo and getnameinfo])
  GETADDRINFO_LIB=
  gai_saved_LIBS="$LIBS"
-  AC_CHECK_HEADERS_ONCE(netdb.h)
+  dnl Where is getaddrinfo()?
  dnl - On Solaris, it is in libsocket.
  dnl - On Haiku, it is in libnetwork.
  dnl - On BeOS, it is in libnet.
  dnl - On native Windows, it is in ws2_32.dll.
  dnl - Otherwise it is in libc.
  AC_SEARCH_LIBS([getaddrinfo], [socket network net],
    [if test "$ac_cv_search_getaddrinfo" != "none required"; then
       GETADDRINFO_LIB="$ac_cv_search_getaddrinfo"
     fi])
  LIBS="$gai_saved_LIBS $GETADDRINFO_LIB"
  AC_SEARCH_LIBS(getaddrinfo, [nsl socket])
  AC_CACHE_CHECK([for getaddrinfo], [gl_cv_func_getaddrinfo], [
    AC_TRY_LINK([
 #include <sys/types.h>
@ -26,7 +38,7 @@ AC_DEFUN([gl_GETADDRINFO],
      [gl_cv_func_getaddrinfo=yes],
      [gl_cv_func_getaddrinfo=no])])
  if test $gl_cv_func_getaddrinfo = no; then
-    AC_CACHE_CHECK(for getaddrinfo in ws2tcpip.h and -lws2_32,
+    AC_CACHE_CHECK([for getaddrinfo in ws2tcpip.h and -lws2_32],
 		   gl_cv_w32_getaddrinfo, [
      gl_cv_w32_getaddrinfo=no
      am_save_LIBS="$LIBS"
@ -37,11 +49,13 @@ AC_DEFUN([gl_GETADDRINFO],
 #endif
 #include <stddef.h>
 ], [getaddrinfo(NULL, NULL, NULL, NULL);], gl_cv_w32_getaddrinfo=yes)
-    LIBS="$am_save_LIBS"])
+      LIBS="$am_save_LIBS"
    ])
    if test "$gl_cv_w32_getaddrinfo" = "yes"; then
-      LIBS="$LIBS -lws2_32"
+      GETADDRINFO_LIB="-lws2_32"
      LIBS="$gai_saved_LIBS $GETADDRINFO_LIB"
    else
-      AC_LIBOBJ(getaddrinfo)
+      AC_LIBOBJ([getaddrinfo])
    fi
  fi
@ -66,40 +80,34 @@ AC_DEFUN([gl_GETADDRINFO],
        [gl_cv_func_gai_strerror=yes],
        [gl_cv_func_gai_strerror=no])])
  if test $gl_cv_func_gai_strerror = no; then
-    AC_LIBOBJ(gai_strerror)
+    AC_LIBOBJ([gai_strerror])
  fi
  LIBS="$gai_saved_LIBS"
  gl_PREREQ_GETADDRINFO
  AC_SUBST([GETADDRINFO_LIB])
 ])
-# Prerequisites of lib/getaddrinfo.h and lib/getaddrinfo.c.
+# Prerequisites of lib/netdb.in.h and lib/getaddrinfo.c.
 AC_DEFUN([gl_PREREQ_GETADDRINFO], [
  AC_REQUIRE([gl_NETDB_H_DEFAULTS])
  AC_REQUIRE([gl_HEADER_SYS_SOCKET])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H
-  AC_SEARCH_LIBS(gethostbyname, [inet nsl])
+  AC_REQUIRE([gl_HOSTENT]) dnl for HOSTENT_LIB
-  AC_SEARCH_LIBS(getservbyname, [inet nsl socket xnet])
+  AC_REQUIRE([gl_SERVENT]) dnl for SERVENT_LIB
  AC_CHECK_FUNCS(gethostbyname,, [
    AC_CACHE_CHECK(for gethostbyname in winsock2.h and -lws2_32,
 		   gl_cv_w32_gethostbyname, [
      gl_cv_w32_gethostbyname=no
      am_save_LIBS="$LIBS"
      LIBS="$LIBS -lws2_32"
      AC_TRY_LINK([
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
 #endif
 #include <stddef.h>
 ], [gethostbyname(NULL);], gl_cv_w32_gethostbyname=yes)
    LIBS="$am_save_LIBS"])
    if test "$gl_cv_w32_gethostbyname" = "yes"; then
      LIBS="$LIBS -lws2_32"
    fi
    ])
  AC_REQUIRE([AC_C_RESTRICT])
  AC_REQUIRE([gl_SOCKET_FAMILIES])
  AC_REQUIRE([gl_HEADER_SYS_SOCKET])
  AC_REQUIRE([AC_C_INLINE])
  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-  AC_CHECK_HEADERS_ONCE(netinet/in.h netdb.h)
+
  dnl Including sys/socket.h is wrong for Windows, but Windows does not
  dnl have sa_len so the result is correct anyway.
  AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , [#include <sys/socket.h>])
  AC_CHECK_HEADERS_ONCE([netinet/in.h])
  AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror, getnameinfo],,,[
  /* sys/types.h is not needed according to POSIX, but the
     sys/socket.h in i386-unknown-freebsd4.10 and
@ -115,6 +123,19 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
 #include <ws2tcpip.h>
 #endif
 ])
  if test $ac_cv_have_decl_getaddrinfo = no; then
    HAVE_DECL_GETADDRINFO=0
  fi
  if test $ac_cv_have_decl_freeaddrinfo = no; then
    HAVE_DECL_FREEADDRINFO=0
  fi
  if test $ac_cv_have_decl_gai_strerror = no; then
    HAVE_DECL_GAI_STRERROR=0
  fi
  if test $ac_cv_have_decl_getnameinfo = no; then
    HAVE_DECL_GETNAMEINFO=0
  fi
  AC_CHECK_TYPES([struct addrinfo],,,[
 #include <sys/types.h>
 #ifdef HAVE_SYS_SOCKET_H
@ -127,4 +148,19 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
 #include <ws2tcpip.h>
 #endif
 ])
  if test $ac_cv_type_struct_addrinfo = no; then
    HAVE_STRUCT_ADDRINFO=0
  fi
  dnl Append $HOSTENT_LIB to GETADDRINFO_LIB, avoiding gratuitous duplicates.
  case " $GETADDRINFO_LIB " in
    *" $HOSTENT_LIB "*) ;;
    *) GETADDRINFO_LIB="$GETADDRINFO_LIB $HOSTENT_LIB" ;;
  esac
  dnl Append $SERVENT_LIB to GETADDRINFO_LIB, avoiding gratuitous duplicates.
  case " $GETADDRINFO_LIB " in
    *" $SERVENT_LIB "*) ;;
    *) GETADDRINFO_LIB="$GETADDRINFO_LIB $SERVENT_LIB" ;;
  esac
 ])
--- a/gl/m4/gethostname.m4
+++ b/gl/m4/gethostname.m4
@ -1,18 +1,21 @@
-# gethostname.m4 serial 2
+# gethostname.m4 serial 5
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2008, 2009 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.
 AC_DEFUN([gl_FUNC_GETHOSTNAME],
 [
-  AC_REPLACE_FUNCS(gethostname)
+  AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
  gl_PREREQ_SYS_H_WINSOCK2
  AC_REPLACE_FUNCS([gethostname])
  if test $ac_cv_func_gethostname = no; then
    HAVE_GETHOSTNAME=0
    gl_PREREQ_GETHOSTNAME
  fi
 ])
 # Prerequisites of lib/gethostname.c.
 AC_DEFUN([gl_PREREQ_GETHOSTNAME], [
-  AC_CHECK_FUNCS(uname)
+  AC_CHECK_FUNCS([uname])
 ])
--- a/gl/m4/getloadavg.m4
+++ b/gl/m4/getloadavg.m4
@ -1,7 +1,7 @@
 # Check for getloadavg.
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2002, 2003,
-# 2006 Free Software Foundation, Inc.
+# 2006, 2008, 2009 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -13,7 +13,12 @@
 # gl_GETLOADAVG(LIBOBJDIR)
 # ------------------------
 AC_DEFUN([gl_GETLOADAVG],
-[gl_have_func=no # yes means we've found a way to get the load average.
+[AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
 # Persuade glibc <stdlib.h> to declare getloadavg().
 AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 gl_have_func=no # yes means we've found a way to get the load average.
 # Make sure getloadavg.c is where it belongs, at configure-time.
 test -f "$srcdir/$1/getloadavg.c" ||
@ -22,17 +27,17 @@ test -f "$srcdir/$1/getloadavg.c" ||
 gl_save_LIBS=$LIBS
 # Check for getloadavg, but be sure not to touch the cache variable.
-(AC_CHECK_FUNC(getloadavg, exit 0, exit 1)) && gl_have_func=yes
+(AC_CHECK_FUNC([getloadavg], [exit 0], [exit 1])) && gl_have_func=yes
 # On HPUX9, an unprivileged user can get load averages through this function.
-AC_CHECK_FUNCS(pstat_getdynamic)
+AC_CHECK_FUNCS([pstat_getdynamic])
 # Solaris has libkstat which does not require root.
-AC_CHECK_LIB(kstat, kstat_open)
+AC_CHECK_LIB([kstat], [kstat_open])
 test $ac_cv_lib_kstat_kstat_open = yes && gl_have_func=yes
 # AIX has libperfstat which does not require root
-AC_CHECK_LIB(perfstat, perfstat_cpu_total)
+AC_CHECK_LIB([perfstat], [perfstat_cpu_total])
 test $ac_cv_lib_perfstat_perfstat_cpu_total = yes && gl_have_func=yes
 # Some systems with -lutil have (and need) -lkvm as well, some do not.
@ -40,12 +45,12 @@ test $ac_cv_lib_perfstat_perfstat_cpu_total = yes && gl_have_func=yes
 # to get the right answer into the cache.
 # For kstat on solaris, we need libelf to force the definition of SVR4 below.
 if test $gl_have_func = no; then
-  AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS")
+  AC_CHECK_LIB([elf], [elf_begin], [LIBS="-lelf $LIBS"])
 fi
 if test $gl_have_func = no; then
-  AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS")
+  AC_CHECK_LIB([kvm], [kvm_open], [LIBS="-lkvm $LIBS"])
  # Check for the 4.4BSD definition of getloadavg.
-  AC_CHECK_LIB(util, getloadavg,
+  AC_CHECK_LIB([util], [getloadavg],
    [LIBS="-lutil $LIBS" gl_have_func=yes gl_cv_func_getloadavg_setgid=yes])
 fi
@ -54,17 +59,17 @@ if test $gl_have_func = no; then
  # Since it is not a standard part of AIX, it might be installed locally.
  gl_getloadavg_LIBS=$LIBS
  LIBS="-L/usr/local/lib $LIBS"
-  AC_CHECK_LIB(getloadavg, getloadavg,
+  AC_CHECK_LIB([getloadavg], [getloadavg],
 	       [LIBS="-lgetloadavg $LIBS"], [LIBS=$gl_getloadavg_LIBS])
 fi
 # Make sure it is really in the library, if we think we found it,
 # otherwise set up the replacement function.
-AC_CHECK_FUNCS(getloadavg, [],
+AC_CHECK_FUNCS([getloadavg], [],
 	       [gl_PREREQ_GETLOADAVG])
 # Some definitions of getloadavg require that the program be installed setgid.
-AC_CACHE_CHECK(whether getloadavg requires setgid,
+AC_CACHE_CHECK([whether getloadavg requires setgid],
 	       gl_cv_func_getloadavg_setgid,
 [AC_EGREP_CPP([Yowza Am I SETGID yet],
 [#define CONFIGURING_GETLOADAVG
@ -77,16 +82,16 @@ Yowza Am I SETGID yet
 	      gl_cv_func_getloadavg_setgid=no)])
 if test $gl_cv_func_getloadavg_setgid = yes; then
  NEED_SETGID=true
-  AC_DEFINE(GETLOADAVG_PRIVILEGED, 1,
+  AC_DEFINE([GETLOADAVG_PRIVILEGED], [1],
 	    [Define to 1 if the `getloadavg' function needs to be run setuid
 	     or setgid.])
 else
  NEED_SETGID=false
 fi
-AC_SUBST(NEED_SETGID)dnl
+AC_SUBST([NEED_SETGID])dnl
 if test $gl_cv_func_getloadavg_setgid = yes; then
-  AC_CACHE_CHECK(group of /dev/kmem, gl_cv_group_kmem,
+  AC_CACHE_CHECK([group of /dev/kmem], [gl_cv_group_kmem],
 [ # On Solaris, /dev/kmem is a symlink.  Get info on the real file.
  ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null`
  # If we got an error (system does not support symlinks), try without -L.
@ -96,7 +101,7 @@ if test $gl_cv_func_getloadavg_setgid = yes; then
 	       s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\)  *.*/\1/
 	       / /s/.* //;p']`
 ])
-  AC_SUBST(KMEM_GROUP, $gl_cv_group_kmem)dnl
+  AC_SUBST([KMEM_GROUP], [$gl_cv_group_kmem])dnl
 fi
 if test "x$gl_save_LIBS" = x; then
  GETLOADAVG_LIBS=$LIBS
@ -105,7 +110,21 @@ else
 fi
 LIBS=$gl_save_LIBS
-AC_SUBST(GETLOADAVG_LIBS)dnl
+AC_SUBST([GETLOADAVG_LIBS])dnl
 # Test whether the system declares getloadavg. Solaris has the function
 # but declares it in <sys/loadavg.h>, not <stdlib.h>.
 AC_CHECK_HEADERS([sys/loadavg.h])
 if test $ac_cv_header_sys_loadavg_h = yes; then
  HAVE_SYS_LOADAVG_H=1
 else
  HAVE_SYS_LOADAVG_H=0
 fi
 AC_CHECK_DECL([getloadavg], [], [HAVE_DECL_GETLOADAVG=0],
  [#if HAVE_SYS_LOADAVG_H
   # include <sys/loadavg.h>
   #endif
   #include <stdlib.h>])
 ])# gl_GETLOADAVG
@ -113,44 +132,44 @@ AC_SUBST(GETLOADAVG_LIBS)dnl
 # --------------------
 # Set up the AC_LIBOBJ replacement of `getloadavg'.
 AC_DEFUN([gl_PREREQ_GETLOADAVG],
-[AC_LIBOBJ(getloadavg)
+[AC_LIBOBJ([getloadavg])
-AC_DEFINE(C_GETLOADAVG, 1, [Define to 1 if using `getloadavg.c'.])
+AC_DEFINE([C_GETLOADAVG], [1], [Define to 1 if using `getloadavg.c'.])
 # Figure out what our getloadavg.c needs.
 gl_have_func=no
-AC_CHECK_HEADER(sys/dg_sys_info.h,
+AC_CHECK_HEADER([sys/dg_sys_info.h],
 [gl_have_func=yes
- AC_DEFINE(DGUX, 1, [Define to 1 for DGUX with <sys/dg_sys_info.h>.])
+ AC_DEFINE([DGUX], [1], [Define to 1 for DGUX with <sys/dg_sys_info.h>.])
- AC_CHECK_LIB(dgc, dg_sys_info)])
+ AC_CHECK_LIB([dgc], [dg_sys_info])])
 # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
 # uses stabs), but it is still SVR4.  We cannot check for <elf.h> because
 # Irix 4.0.5F has the header but not the library.
 if test $gl_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then
  gl_have_func=yes
-  AC_DEFINE(SVR4, 1, [Define to 1 on System V Release 4.])
+  AC_DEFINE([SVR4], [1], [Define to 1 on System V Release 4.])
 fi
 if test $gl_have_func = no; then
-  AC_CHECK_HEADER(inq_stats/cpustats.h,
+  AC_CHECK_HEADER([inq_stats/cpustats.h],
  [gl_have_func=yes
-   AC_DEFINE(UMAX, 1, [Define to 1 for Encore UMAX.])
+   AC_DEFINE([UMAX], [1], [Define to 1 for Encore UMAX.])
-   AC_DEFINE(UMAX4_3, 1,
+   AC_DEFINE([UMAX4_3], [1],
 	     [Define to 1 for Encore UMAX 4.3 that has <inq_status/cpustats.h>
 	      instead of <sys/cpustats.h>.])])
 fi
 if test $gl_have_func = no; then
-  AC_CHECK_HEADER(sys/cpustats.h,
+  AC_CHECK_HEADER([sys/cpustats.h],
-  [gl_have_func=yes; AC_DEFINE(UMAX)])
+  [gl_have_func=yes; AC_DEFINE([UMAX])])
 fi
 if test $gl_have_func = no; then
-  AC_CHECK_HEADERS(mach/mach.h)
+  AC_CHECK_HEADERS([mach/mach.h])
 fi
-AC_CHECK_HEADERS(nlist.h,
+AC_CHECK_HEADERS([nlist.h],
 [AC_CHECK_MEMBERS([struct nlist.n_un.n_name],
-		  [AC_DEFINE(NLIST_NAME_UNION, 1,
+		  [AC_DEFINE([NLIST_NAME_UNION], [1],
 			     [Define to 1 if your `struct nlist' has an
 			      `n_un' member.  Obsolete, depend on
 			      `HAVE_STRUCT_NLIST_N_UN_N_NAME])], [],
--- a/gl/m4/getopt.m4
+++ b/gl/m4/getopt.m4
@ -1,5 +1,5 @@
-# getopt.m4 serial 13
+# getopt.m4 serial 14
-dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2008 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.
@ -46,7 +46,7 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
  if test -z "$GETOPT_H"; then
    AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_gnu_getopt],
      [AC_RUN_IFELSE(
-	[AC_LANG_PROGRAM([#include <getopt.h>],
+	[AC_LANG_PROGRAM([[#include <getopt.h>]],
 	   [[
 	     char *myargv[3];
 	     myargv[0] = "conftest";
--- a/gl/m4/gettext.m4
+++ b/gl/m4/gettext.m4
@ -1,5 +1,5 @@
-# gettext.m4 serial 60 (gettext-0.17)
+# gettext.m4 serial 62 (gettext-0.18)
-dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2009 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.
@ -123,11 +123,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
    gt_use_preinstalled_gnugettext=no
    ifelse(gt_included_intl, yes, [
      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
+      AC_ARG_WITH([included-gettext],
        [  --with-included-gettext use the GNU gettext library included here],
        nls_cv_force_use_gnu_gettext=$withval,
        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
@ -267,7 +267,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
    if test "$gt_use_preinstalled_gnugettext" = "yes" \
       || test "$nls_cv_use_gnu_gettext" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1,
+      AC_DEFINE([ENABLE_NLS], [1],
        [Define to 1 if translation of program messages to the user's native language
   is requested.])
    else
@ -301,9 +301,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
      fi
      dnl For backward compatibility. Some packages may be using this.
-      AC_DEFINE(HAVE_GETTEXT, 1,
+      AC_DEFINE([HAVE_GETTEXT], [1],
       [Define if the GNU gettext() function is already present or preinstalled.])
-      AC_DEFINE(HAVE_DCGETTEXT, 1,
+      AC_DEFINE([HAVE_DCGETTEXT], [1],
       [Define if the GNU dcgettext() function is already present or preinstalled.])
    fi
@ -319,9 +319,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
    fi
    dnl Make all variables we use known to autoconf.
-    AC_SUBST(BUILD_INCLUDED_LIBINTL)
+    AC_SUBST([BUILD_INCLUDED_LIBINTL])
-    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST([USE_INCLUDED_LIBINTL])
-    AC_SUBST(CATOBJEXT)
+    AC_SUBST([CATOBJEXT])
    dnl For backward compatibility. Some configure.ins may be using this.
    nls_cv_header_intl=
@ -329,36 +329,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
    dnl For backward compatibility. Some Makefiles may be using this.
    DATADIRNAME=share
-    AC_SUBST(DATADIRNAME)
+    AC_SUBST([DATADIRNAME])
    dnl For backward compatibility. Some Makefiles may be using this.
    INSTOBJEXT=.mo
-    AC_SUBST(INSTOBJEXT)
+    AC_SUBST([INSTOBJEXT])
    dnl For backward compatibility. Some Makefiles may be using this.
    GENCAT=gencat
-    AC_SUBST(GENCAT)
+    AC_SUBST([GENCAT])
    dnl For backward compatibility. Some Makefiles may be using this.
    INTLOBJS=
    if test "$USE_INCLUDED_LIBINTL" = yes; then
      INTLOBJS="\$(GETTOBJS)"
    fi
-    AC_SUBST(INTLOBJS)
+    AC_SUBST([INTLOBJS])
    dnl Enable libtool support if the surrounding package wishes it.
    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
-    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
  ])
  dnl For backward compatibility. Some Makefiles may be using this.
  INTLLIBS="$LIBINTL"
-  AC_SUBST(INTLLIBS)
+  AC_SUBST([INTLLIBS])
  dnl Make all documented variables known to autoconf.
-  AC_SUBST(LIBINTL)
+  AC_SUBST([LIBINTL])
-  AC_SUBST(LTLIBINTL)
+  AC_SUBST([LTLIBINTL])
-  AC_SUBST(POSUB)
+  AC_SUBST([POSUB])
 ])
--- a/gl/m4/glibc21.m4
+++ b/gl/m4/glibc21.m4
@ -1,5 +1,5 @@
-# glibc21.m4 serial 3
+# glibc21.m4 serial 4
-dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2004, 2008 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.
@ -9,8 +9,8 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_GLIBC21],
  [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+    AC_CACHE_CHECK([whether we are using the GNU C Library 2.1 or newer],
-      ac_cv_gnu_library_2_1,
+      [ac_cv_gnu_library_2_1],
      [AC_EGREP_CPP([Lucky GNU user],
 	[
 #include <features.h>
@ -20,11 +20,11 @@ AC_DEFUN([gl_GLIBC21],
 #endif
 #endif
 	],
-	ac_cv_gnu_library_2_1=yes,
+	[ac_cv_gnu_library_2_1=yes],
-	ac_cv_gnu_library_2_1=no)
+	[ac_cv_gnu_library_2_1=no])
      ]
    )
-    AC_SUBST(GLIBC21)
+    AC_SUBST([GLIBC21])
    GLIBC21="$ac_cv_gnu_library_2_1"
  ]
 )
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@ -0,0 +1,47 @@
 # Copyright (C) 2002-2009 Free Software Foundation, Inc.
 #
 # This file is free software, distributed under the terms of the GNU
 # General Public License.  As a special exception to the GNU General
 # Public License, this file may be distributed as part of a program
 # that contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
 #
 # This file represents the specification of how gnulib-tool is used.
 # It acts as a cache: It is written and read by gnulib-tool.
 # In projects using CVS, this file is meant to be stored in CVS,
 # like the configure.ac and various Makefile.am files.
 # Specification in the form of a command-line invocation:
 #   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl base64 dirname floorf fsusage getaddrinfo gethostname getloadavg getopt gettext mountlist regex timegm vasprintf vsnprintf
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
 gl_MODULES([
  base64
  dirname
  floorf
  fsusage
  getaddrinfo
  gethostname
  getloadavg
  getopt
  gettext
  mountlist
  regex
  timegm
  vasprintf
  vsnprintf
 ])
 gl_AVOID([])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])
 gl_PO_BASE([])
 gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])
 gl_LIB([libgnu])
 gl_MAKEFILE_NAME([])
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
--- a/Show more
+++ b/Show more