[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-89-g6038ece

Hilko Bengen bengen at debian.org
Mon Jan 7 18:44:43 UTC 2013


The following commit has been merged in the master branch:
commit ecb5297913cc46542afb661f8906f60f40c26c1b
Merge: e334f25e756002605cd8b3b9864dfd960f70a8c0 c6df967a316a1ce3949d58eb6cb089fc3be92d48
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon May 7 18:59:40 2012 +0200

    Imported Debian patch 1:1.16.21-1

diff --combined debian/changelog
index 1198f5f,e3cf715..b59ec1c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,431 -1,8 +1,438 @@@
 -libguestfs (1.16.21-1) unstable; urgency=low
++libguestfs (1:1.16.21-1) unstable; urgency=low
+ 
 -  * release: New upstream version 1.16.21.
++  * New upstream version
++  * Rebased patch queue
+ 
 - -- Richard W.M. Jones <rjones at redhat.com>  Thu,  9 Dec 2010 12:00:00 +0000
++ -- Hilko Bengen <bengen at debian.org>  Mon, 07 May 2012 18:59:40 +0200
++
 +libguestfs (1:1.16.20-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 25 Apr 2012 22:35:23 +0200
 +
 +libguestfs (1:1.16.19-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 18 Apr 2012 22:04:09 +0200
 +
 +libguestfs (1:1.16.18-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Fri, 13 Apr 2012 20:14:25 +0200
 +
 +libguestfs (1:1.16.17-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Thu, 12 Apr 2012 07:32:30 +0200
 +
 +libguestfs (1:1.16.16-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [9e988bc] rebased patch queue
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 11 Apr 2012 21:36:46 +0200
 +
 +libguestfs (1:1.16.15-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Tue, 03 Apr 2012 23:30:34 +0200
 +
 +libguestfs (1:1.16.13-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [007ca10] Rebased patch queue
 +
 + -- Hilko Bengen <bengen at debian.org>  Sat, 31 Mar 2012 14:11:46 +0200
 +
 +libguestfs (1:1.16.12-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [0e321b7] Added configure parameter for setting JNI installation
 +    directory
 +  * [8b63b64] Rebased patch queue, added out-of-tree build fix for
 +    Java and appliance
 +
 + -- Hilko Bengen <bengen at debian.org>  Tue, 27 Mar 2012 19:49:02 +0200
 +
 +libguestfs (1:1.16.10-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Tue, 13 Mar 2012 17:50:15 +0100
 +
 +libguestfs (1:1.16.9-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [8a8b9d3] Added dependencies on netpbm, icoutils which are used to
 +    generate guest icons in inspection output.
 +
 + -- Hilko Bengen <bengen at debian.org>  Fri, 09 Mar 2012 17:37:31 +0100
 +
 +libguestfs (1:1.16.8-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Mon, 05 Mar 2012 22:42:32 +0100
 +
 +libguestfs (1:1.16.7-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [ff29ecd] Rebased patch queue
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 04 Mar 2012 13:23:09 +0100
 +
 +libguestfs (1:1.16.6-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [595a350] Bumped Standards-Version
 +
 + -- Hilko Bengen <bengen at debian.org>  Thu, 01 Mar 2012 23:39:42 +0100
 +
 +libguestfs (1:1.16.5-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [1aee45e] Rebased patch queue
 +
 + -- Hilko Bengen <bengen at debian.org>  Mon, 13 Feb 2012 21:03:09 +0100
 +
 +libguestfs (1:1.16.4-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [e47e59d] Rebased patch queue, disabled virt-format test
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 12 Feb 2012 17:37:36 +0100
 +
 +libguestfs (1:1.16.3-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [1421212] Updated debian/.gitignore
 +  * [80e9955] Rebased patch queue
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 08 Feb 2012 23:00:46 +0100
 +
 +libguestfs (1:1.16.2-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [4a57faf] Rebased patch queue
 +  * [a99c16a] Fixed dh call
 +
 + -- Hilko Bengen <bengen at debian.org>  Tue, 31 Jan 2012 23:13:36 +0100
 +
 +libguestfs (1:1.16.1-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [8347c84] Rebased patch queue
 +  * [e70e31c] Added git:Depends to be filled by dh_girepository
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 25 Jan 2012 00:12:23 +0100
 +
 +libguestfs (1:1.16.0-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [b4f8deb] Rebased patch queue
 +  * [df8dd81] Updated watch file for 1.16.x
 +  * [d766d82] Stripped redundant package descriptions
 +  * [d044727] Added packages for GObject bindings and introspection
 +  * [9c5fa98] Added configuration for git-buildpackage
 +  * [12bedd8] Added workaround for
 +    "{pre,post}inst-has-useless-call-to-ldconfig" Lintian warnings
 +    (libguestfs-java)
 +
 + -- Hilko Bengen <bengen at debian.org>  Tue, 24 Jan 2012 22:04:39 +0100
 +
 +libguestfs (1:1.14.9-2) unstable; urgency=low
 +
 +  * [4bf0ed5] Added ruby-guestfs package
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 15 Jan 2012 20:48:23 +0100
 +
 +libguestfs (1:1.14.9-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [2f2da0e] Rebased patch queue
 +  * [89e1a16] Added Conflicts to address the moved man-pages
 +
 + -- Hilko Bengen <bengen at debian.org>  Tue, 10 Jan 2012 23:54:21 +0100
 +
 +libguestfs (1:1.14.8-3) unstable; urgency=low
 +
 +  * [0344ab5] Re-sorted which manpages go into what package. Added a few
 +    missing manpages.
 +  * [41e92c5] Moved bash-completion snippet for guestfish to the guestfish
 +    package.
 +  * [1184b62] Removed empty libguestfs-doc package.
 +  * [1bec3c7] Added examples to libguestfs-dev and language bindings packages.
 +
 + -- Hilko Bengen <bengen at debian.org>  Fri, 30 Dec 2011 18:39:01 +0100
 +
 +libguestfs (1:1.14.8-2) unstable; urgency=low
 +
 +  * [fd34116] Removed dependency on ntfsprogs since they are now packaged
 +    along with ntfs-3g.
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 28 Dec 2011 10:57:52 +0100
 +
 +libguestfs (1:1.14.8-1) unstable; urgency=high
 +
 +  * New upstream version
 +  * Mitigate possible privilege escalation via SG_IO ioctl (CVE-2011-4127,
 +    RHBZ#757071)
 +
 + -- Hilko Bengen <bengen at debian.org>  Thu, 22 Dec 2011 23:12:21 +0100
 +
 +libguestfs (1:1.14.7-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [d7a96c1] Added fixes for building Python2 bindings on squeeze
 +  * [565ae83] Added fixes for building Python3 bindings on squeeze
 +
 + -- Hilko Bengen <bengen at debian.org>  Sat, 10 Dec 2011 21:36:00 +0100
 +
 +libguestfs (1:1.14.6-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 07 Dec 2011 00:24:43 +0100
 +
 +libguestfs (1:1.14.5-1) unstable; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Fri, 02 Dec 2011 21:16:54 +0100
 +
 +libguestfs (1:1.14.4-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [9c1fed8] Rebased patch queue
 +
 + -- Hilko Bengen <bengen at debian.org>  Fri, 25 Nov 2011 23:25:27 +0100
 +
 +libguestfs (1:1.14.3-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [cacf69d] Ran debconf-updatepo as suggested by lintian
 +  * [f3f7c4e] Rebased patch queue
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 23 Nov 2011 08:53:24 +0100
 +
 +libguestfs (1:1.14.2-4) unstable; urgency=low
 +
 +  * [f9c46d5] Added patch to install Java bindings to /usr/lib/jni. This
 +    eliminates a file conflict between libguestfs-java and libguestfs-dev
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 20 Nov 2011 23:41:01 +0100
 +
 +libguestfs (1:1.14.2-3) unstable; urgency=low
 +
 +  * Added an epoch after uploading an 1.15 package to unstable instead of
 +    experimental.
 +
 + -- Hilko Bengen <bengen at debian.org>  Fri, 18 Nov 2011 17:10:30 +0100
 +
 +libguestfs (1.14.2-2) unstable; urgency=low
 +
 +  * [cf7da64] Updated .gitignore
 +  * [ab7d4d9] Fixed copy&paste error in erlang-guestfs description
 +  * [c6c5d54] Added configuration file and bash completion snippet to
 +    libguestfs-tools
 +  * [dbbf2f1] Added Java bindings
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 16 Nov 2011 09:47:47 +0100
 +
 +libguestfs (1.14.2-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [c27fa27] Rebased patch queue, added fix for Erlang bindings build
 +  * [a563153] Added package for Erlang bindings
 +
 + -- Hilko Bengen <bengen at debian.org>  Thu, 10 Nov 2011 23:50:41 +0100
 +
 +libguestfs (1.14.1-2) unstable; urgency=low
 +
 +  * [44d13ed] Run tests in all build directories
 +  * [fbfe97e] Added upstream's patches for Python 3.x support
 +  * [4938eec] Re-enabled build of python3 bindings
 +
 + -- Hilko Bengen <bengen at debian.org>  Thu, 03 Nov 2011 12:18:18 +0100
 +
 +libguestfs (1.14.1-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [0dfbcaf] Enabled support for SELinux, Systemtap, updated build dependencies
 +  * [0548ce6] Disabled building of Python bindings for Python 3.x. Many
 +    warnings about undefined symbols are given, they would not work
 +    anyhow. Thanks to Neil Wilson for bringing this to my attention.
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 02 Nov 2011 22:43:33 +0100
 +
 +libguestfs (1.14.0-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [19863e1] Imported patch queue from 1.13.24-1 (experimental)
 +  * [ad9d721] Disabled building of Erlang bindings until I figure out how to package those
 +  * [d92329b] Re-enabled vmchannel test
 +  * [08e806a] Updated watch file
 +
 + -- Hilko Bengen <bengen at debian.org>  Sat, 29 Oct 2011 18:23:02 +0200
 +
 +libguestfs (1.12.8-2) unstable; urgency=low
 +
 +  * [5c40932] Added fix for qemu 0.15 -machine option
 +  * [c45157d] Disabled vmchannel test (Closes: #646295)
 +
 + -- Hilko Bengen <bengen at debian.org>  Mon, 24 Oct 2011 16:23:19 +0200
 +
 +libguestfs (1.12.8-1) unstable; urgency=low
 +
 +  * New upstream version 
 +  * [e85ce09] Rebased patch queue; fixed bindtests and inspector tests
 +  * [5294a7e] Got rid of a shortcut in building bindings for multiple
 +    Python versions. This stopped working with Python 2.7 being the
 +    default python.
 +  * [689757d] Added Spanish debconf translations, thanks to SM Baby
 +    Siabef. (Closes: #642068)
 +  * [c09d3d5] Added Dutch debconf translations, thanks to Jeroen Schot.
 +    (Closes: #642290)
 +  * [48a726d] Added Czech debconf translation, thanks to Michal Simunek.
 +    (Closes: #642437)
 +  * [09c47b4] Removed grub-pc dependency, as suggested on IRC.
 +    (Closes: #645119)
 +
 + -- Hilko Bengen <bengen at debian.org>  Thu, 20 Oct 2011 13:13:00 +0200
 +
 +libguestfs (1.12.7-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [96f89ea] Added Portuguese debconf translations, thanks to "Traduz".
 +    (Closes: #641160)
 +  * [509dc8d] Added French debconf translations, thanks to Julien
 +    Patriarca. (Closes: #641407)
 +  * [348682d] Added German debconf translations, thanks to Chris Leick.
 +    (Closes: #641347)
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 18 Sep 2011 22:55:57 +0200
 +
 +libguestfs (1.12.6-2) unstable; urgency=low
 +
 +  * [00e96af] Applied changes to debconf templates and package
 +    descriptions as suggested by Christian PERRIER on behalf of the
 +    debian-l10n-english team. (Closes: #640470)
 +  * [6ac64b9] Added Swedish debconf translations, thanks to Martin
 +    Bagge. (Closes: #640831)
 +  * [18b2e33] Added Danish debconf translations, thanks to Joe Dalton.
 +    (Closes: #640832)
 +  * [5bd6bb4] Added Russian debconf translations, thanks to Yuri
 +    Kozlov. (Closes: #640945)
 +
 + -- Hilko Bengen <bengen at debian.org>  Sat, 10 Sep 2011 14:33:45 +0200
 +
 +libguestfs (1.12.6-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [dad2b57] Rebased patch queue
 +
 + -- Hilko Bengen <bengen at debian.org>  Tue, 06 Sep 2011 20:03:23 +0200
 +
 +libguestfs (1.12.5-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [38c612e] Added Vcs-* fields to debian/control
 +  * [cdd4f34] Updated watch file
 +  * [29c7217] Removed those patches that have made it into the upstream release
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 28 Aug 2011 14:52:21 +0200
 +
 +libguestfs (1.12.4-2) unstable; urgency=low
 +
 +  * [2d93cf5] Re-added supermin.d directory that was missing in -1.
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 21 Aug 2011 01:03:09 +0200
 +
 +libguestfs (1.12.4-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [3168278] Added patches for the build scripts to allow for a separate
 +    build directory
 +  * [f5fac3a] Use separate build directory, build multiple versions of the
 +    Python bindings
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 21 Aug 2011 00:25:59 +0200
 +
 +libguestfs (1.12.3-2) unstable; urgency=low
 +
 +  * Brown paper bag release
 +  * [33f8362] Fixed update script.
 +  * [d703c73] fixed guestfsd dependencies
 +
 + -- Hilko Bengen <bengen at debian.org>  Sat, 13 Aug 2011 00:32:03 +0200
 +
 +libguestfs (1.12.3-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * [b61cb3c] Added umask-setting code to update-guestfs-appliance.
 +    Closes: #637437
 +  * [6a43d8f] Dropped dependency on Linux kernel package. Closes: #637438
 +  * [52d2752] Added guestfsd package
 +  * [4690370] Updated patches
 +
 + -- Hilko Bengen <bengen at debian.org>  Fri, 12 Aug 2011 23:28:15 +0200
 +
 +libguestfs (1.10.7-3) unstable; urgency=low
 +
 +  * [c65e1bb] Fixed FTBFS by making fuse test depend on appliance. Thanks
 +    to Guido Günther for spotting this.
 +  * [fe797af] Added fix for systemd-based host. Thanks to Paul Wise for
 +    testing.
 +
 + -- Hilko Bengen <bengen at debian.org>  Thu, 11 Aug 2011 00:25:19 +0200
 +
 +libguestfs (1.10.7-2) unstable; urgency=low
 +
 +  * [3ec437d] Added missing dependencies (Closes: #608103)
 +
 + -- Hilko Bengen <bengen at debian.org>  Wed, 10 Aug 2011 22:48:56 +0200
 +
 +libguestfs (1.10.7-1) unstable; urgency=low
 +
 +  * New upstream version
 +  * First upload to unstable
 +  * [5d22450] Adjusted some Section: and Architecture: fields
 +  * [976c8b8] Removed pre-setting answer to Debconf question
 +
 + -- Hilko Bengen <bengen at debian.org>  Mon, 08 Aug 2011 20:43:50 +0200
 +
 +libguestfs (1.10.6-3) experimental; urgency=low
 +
 +  * [f1217be] Fixed building of Python binding
 +  * [6a5de14] Added update-guestfs-appliance
 +  * [e6743be] Integrated update-guestfs-appliance using debconf.
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 07 Aug 2011 19:00:18 +0200
 +
 +libguestfs (1.10.6-2) experimental; urgency=low
 +
 +  * [3de1b06] Added missing dependency for libguestfs-ocaml-dev, thanks to
 +    Stéphane Glondu
 +
 + -- Hilko Bengen <bengen at debian.org>  Mon, 01 Aug 2011 16:59:25 +0200
 +
 +libguestfs (1.10.6-1) experimental; urgency=low
 +
 +  * New upstream version
 +  * Updated copyright file
 +
 + -- Hilko Bengen <bengen at debian.org>  Sun, 31 Jul 2011 23:25:48 +0200
 +
 +libguestfs (1.10.5-1) experimental; urgency=low
 +
 +  * New upstream version
 +
 + -- Hilko Bengen <bengen at debian.org>  Fri, 29 Jul 2011 23:42:50 +0200
  
  libguestfs (1.0.84-4) unstable; urgency=low
  
diff --combined debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
index 0034b34,0000000..371941d
mode 100644,000000..100644
--- a/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
+++ b/debian/patches/0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
@@@ -1,23 -1,0 +1,23 @@@
 +From: Hilko Bengen <bengen at debian.org>
 +Date: Sun, 3 Jul 2011 12:47:23 +0200
 +Subject: Mount /run as tmpfs inside appliance (workaround for febootstrap's
 + /init)
 +
 +---
 + appliance/init |    3 +++
 + 1 file changed, 3 insertions(+)
 +
 +diff --git a/appliance/init b/appliance/init
- index f44ad7b..0c0ad76 100755
++index 15ced71..c6853be 100755
 +--- a/appliance/init
 ++++ b/appliance/init
- @@ -16,6 +16,9 @@ rm -f /proc; mkdir /proc
-  mount -t proc /proc /proc
-  rm -f /sys; mkdir /sys
++@@ -18,6 +18,9 @@ mount -t proc /proc /proc
++ if [ ! -d /sys ]; then rm -f /sys; fi
++ mkdir -p /sys
 + mount -t sysfs /sys /sys
 ++# taken from initramfs-tools/init --Hilko Bengen
 ++mkdir -p /run
 ++mount -t tmpfs -o "nosuid,size=20%,mode=0755" tmpfs /run
 + mkdir -p /run/lock
 + 
 + # devtmpfs is required since udev 176
diff --combined debian/patches/0008-autoreconf.patch
index 62c0be9,0000000..0c0f2b4
mode 100644,000000..100644
--- a/debian/patches/0008-autoreconf.patch
+++ b/debian/patches/0008-autoreconf.patch
@@@ -1,4818 -1,0 +1,8588 @@@
 +From: Hilko Bengen <bengen at debian.org>
 +Date: Tue, 10 Jan 2012 13:30:43 +0100
 +Subject: autoreconf
 +
 +---
-  Makefile.in                   |   49 ++++++---
-  aclocal.m4                    |   20 ++--
-  align/Makefile.in             |   46 +++++++--
-  appliance/Makefile.in         |   34 ++++++-
-  build-aux/config.guess        |  222 ++++++++++++++++++++++-------------------
-  build-aux/config.sub          |  159 +++++++++++++++++++----------
-  cat/Makefile.in               |   46 +++++++--
-  clone/Makefile.in             |   46 +++++++--
-  configure                     |   54 ++++++----
-  csharp/Makefile.in            |   24 ++++-
-  daemon/Makefile.in            |   33 +++++-
-  df/Makefile.in                |   46 +++++++--
-  edit/Makefile.in              |   46 +++++++--
-  erlang/Makefile.in            |   34 ++++++-
-  erlang/examples/Makefile.in   |   41 ++++++--
-  examples/Makefile.in          |   58 +++++++++--
-  fish/Makefile.in              |   61 +++++++++--
-  format/Makefile.in            |   46 +++++++--
-  fuse/Makefile.in              |   46 +++++++--
-  generator/Makefile.in         |   24 ++++-
-  gnulib/lib/Makefile.in        |   35 +++++--
-  gnulib/tests/Makefile.in      |   35 +++++--
-  gobject/Makefile.in           |   42 +++++++-
-  haskell/Makefile.in           |   24 ++++-
-  inspector/Makefile.in         |   51 ++++++++--
-  java/Makefile.in              |   32 +++++-
-  java/examples/Makefile.in     |   41 ++++++--
-  ocaml/Makefile.in             |   24 ++++-
-  ocaml/examples/Makefile.in    |   41 ++++++--
-  perl/Makefile.in              |   25 ++++-
-  perl/examples/Makefile.in     |   41 ++++++--
-  php/Makefile.in               |   29 +++++-
-  po-docs/Makefile.in           |   35 +++++--
-  po-docs/ja/Makefile.in        |   24 ++++-
-  po-docs/uk/Makefile.in        |   24 ++++-
-  po/POTFILES.in                |    6 --
-  python/Makefile.in            |   32 +++++-
-  python/examples/Makefile.in   |   41 ++++++--
-  rescue/Makefile.in            |   46 +++++++--
-  resize/Makefile.in            |   46 +++++++--
-  ruby/Makefile.in              |   36 +++++--
-  ruby/examples/Makefile.in     |   41 ++++++--
-  sparsify/Makefile.in          |   46 +++++++--
-  src/Makefile.in               |   49 +++++++--
-  test-tool/Makefile.in         |   46 +++++++--
-  tests/c-api/Makefile.in       |   24 ++++-
-  tests/data/Makefile.in        |   24 ++++-
-  tests/extra/Makefile.in       |   24 ++++-
-  tests/guests/Makefile.in      |   24 ++++-
-  tests/luks/Makefile.in        |   24 ++++-
-  tests/lvm/Makefile.in         |   24 ++++-
-  tests/md/Makefile.in          |   24 ++++-
-  tests/protocol/Makefile.in    |   24 ++++-
-  tests/qemu/Makefile.in        |   24 ++++-
-  tests/regressions/Makefile.in |   24 ++++-
-  tools/Makefile.in             |   46 +++++++--
-  56 files changed, 1880 insertions(+), 433 deletions(-)
++ Makefile.in                   |   85 ++++---
++ aclocal.m4                    |   25 +-
++ align/Makefile.in             |   82 +++++--
++ appliance/Makefile.in         |   70 ++++--
++ build-aux/config.guess        |  222 +++++++++--------
++ build-aux/config.sub          |  159 +++++++++----
++ cat/Makefile.in               |   82 +++++--
++ clone/Makefile.in             |   82 +++++--
++ config.h.in                   |   14 +-
++ configure                     |  528 +++++++++++++++++++++--------------------
++ csharp/Makefile.in            |   60 +++--
++ daemon/Makefile.in            |   69 ++++--
++ df/Makefile.in                |   82 +++++--
++ edit/Makefile.in              |   82 +++++--
++ erlang/Makefile.in            |   70 ++++--
++ erlang/examples/Makefile.in   |   77 ++++--
++ examples/Makefile.in          |   94 +++++---
++ fish/Makefile.in              |   97 +++++---
++ format/Makefile.in            |   82 +++++--
++ fuse/Makefile.in              |   82 +++++--
++ generator/Makefile.in         |   60 +++--
++ gnulib/lib/Makefile.in        |   71 ++++--
++ gnulib/tests/Makefile.in      |   71 ++++--
++ gobject/Makefile.in           |   78 ++++--
++ haskell/Makefile.in           |   60 +++--
++ inspector/Makefile.in         |   87 +++++--
++ java/Makefile.in              |   68 ++++--
++ java/examples/Makefile.in     |   77 ++++--
++ ocaml/Makefile.in             |   60 +++--
++ ocaml/examples/Makefile.in    |   77 ++++--
++ perl/Makefile.in              |   61 +++--
++ perl/examples/Makefile.in     |   77 ++++--
++ php/Makefile.in               |   65 +++--
++ po-docs/Makefile.in           |   71 ++++--
++ po-docs/ja/Makefile.in        |   60 +++--
++ po-docs/uk/Makefile.in        |   60 +++--
++ po/POTFILES.in                |    6 -
++ python/Makefile.in            |   68 ++++--
++ python/examples/Makefile.in   |   77 ++++--
++ rescue/Makefile.in            |   82 +++++--
++ resize/Makefile.in            |   82 +++++--
++ ruby/Makefile.in              |   72 ++++--
++ ruby/examples/Makefile.in     |   77 ++++--
++ sparsify/Makefile.in          |   82 +++++--
++ src/Makefile.in               |   90 ++++---
++ test-tool/Makefile.in         |   82 +++++--
++ tests/c-api/Makefile.in       |   60 +++--
++ tests/data/Makefile.in        |   60 +++--
++ tests/extra/Makefile.in       |   60 +++--
++ tests/guests/Makefile.in      |   60 +++--
++ tests/luks/Makefile.in        |   60 +++--
++ tests/lvm/Makefile.in         |   60 +++--
++ tests/md/Makefile.in          |   60 +++--
++ tests/protocol/Makefile.in    |   60 +++--
++ tests/qemu/Makefile.in        |   60 +++--
++ tests/regressions/Makefile.in |   60 +++--
++ tools/Makefile.in             |   82 +++++--
++ 57 files changed, 3051 insertions(+), 1596 deletions(-)
 +
 +diff --git a/Makefile.in b/Makefile.in
- index 1aab16b..ff97c3d 100644
++index e559614..72610d5 100644
 +--- a/Makefile.in
 ++++ b/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
- @@ -50,6 +50,23 @@
++@@ -49,6 +49,23 @@
++ # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
- @@ -71,9 +88,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
++@@ -69,11 +86,11 @@ host_triplet = @host@
++ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 + 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-  	$(srcdir)/libguestfs.pc.in $(srcdir)/podwrapper.sh.in \
-  	$(srcdir)/run.in $(top_srcdir)/configure \
- -	$(top_srcdir)/debian/changelog.in \
++ 	$(srcdir)/podwrapper.sh.in $(srcdir)/run.in \
++-	$(top_srcdir)/configure $(top_srcdir)/debian/changelog.in \
 +-	$(top_srcdir)/subdir-rules.mk AUTHORS COPYING COPYING.LIB TODO \
 +-	build-aux/compile build-aux/config.guess \
- +	$(top_srcdir)/subdir-rules.mk AUTHORS COPYING COPYING.LIB \
- +	ChangeLog TODO build-aux/compile build-aux/config.guess \
-  	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
-  	build-aux/install-sh build-aux/ltmain.sh build-aux/missing
++-	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
++-	build-aux/install-sh build-aux/ltmain.sh build-aux/missing
+++	$(top_srcdir)/configure $(top_srcdir)/subdir-rules.mk AUTHORS \
+++	COPYING COPYING.LIB ChangeLog TODO build-aux/compile \
+++	build-aux/config.guess build-aux/config.rpath \
+++	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+++	build-aux/ltmain.sh build-aux/missing
 + @ENABLE_DAEMON_TRUE at am__append_1 = daemon
- @@ -226,7 +242,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ 
++ # Tests - order is important.
++@@ -148,24 +165,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
++@@ -224,7 +241,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 +  configure.lineno config.status.lineno
 + mkinstalldirs = $(install_sh) -d
 + CONFIG_HEADER = config.h
- -CONFIG_CLEAN_FILES = podwrapper.sh run debian/changelog libguestfs.pc
- +CONFIG_CLEAN_FILES = podwrapper.sh run libguestfs.pc
++-CONFIG_CLEAN_FILES = podwrapper.sh run debian/changelog
+++CONFIG_CLEAN_FILES = podwrapper.sh run
 + CONFIG_CLEAN_VPATH_FILES =
 + AM_V_GEN = $(am__v_GEN_ at AM_V@)
 + am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
- @@ -243,6 +259,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++@@ -241,6 +258,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 + 	install-pdf-recursive install-ps-recursive install-recursive \
 + 	installcheck-recursive installdirs-recursive pdf-recursive \
 + 	ps-recursive uninstall-recursive
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
-  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-  am__vpath_adj = case $$p in \
-      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1544,8 +1565,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
++ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
++   distclean-recursive maintainer-clean-recursive
++ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
++@@ -1510,8 +1532,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
 + run: $(top_builddir)/config.status $(srcdir)/run.in
 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
 +-debian/changelog: $(top_builddir)/config.status $(top_srcdir)/debian/changelog.in
 +-	cd $(top_builddir) && $(SHELL) ./config.status $@
-  libguestfs.pc: $(top_builddir)/config.status $(srcdir)/libguestfs.pc.in
-  	cd $(top_builddir) && $(SHELL) ./config.status $@
 + 
- @@ -1559,8 +1578,11 @@ distclean-libtool:
-  	-rm -f libtool config.lt
-  install-pkgconfigDATA: $(pkgconfig_DATA)
-  	@$(NORMAL_INSTALL)
- -	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-  	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
- +	if test -n "$$list"; then \
- +	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)' || exit 1; \
- +	fi; \
-  	for p in $$list; do \
-  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-  	  echo "$$d$$p"; \
- @@ -1745,13 +1767,10 @@ distdir: $(DISTFILES)
++ mostlyclean-libtool:
++ 	-rm -f *.lo
++@@ -1691,13 +1711,10 @@ distdir: $(DISTFILES)
 + 	done
 + 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 + 	  if test "$$subdir" = .; then :; else \
 +-	    test -d "$(distdir)/$$subdir" \
 +-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 +-	    || exit 1; \
 +-	  fi; \
 +-	done
 +-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 +-	  if test "$$subdir" = .; then :; else \
 ++	    $(am__make_dryrun) \
 ++	      || test -d "$(distdir)/$$subdir" \
 ++	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 ++	      || exit 1; \
 + 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 + 	    $(am__relativize); \
 + 	    new_distdir=$$reldir; \
 +diff --git a/aclocal.m4 b/aclocal.m4
- index 18f8db5..00ab473 100644
++index 18f8db5..5d13301 100644
 +--- a/aclocal.m4
 ++++ b/aclocal.m4
 +@@ -1,4 +1,4 @@
 +-# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
- +# generated automatically by aclocal 1.11.4 -*- Autoconf -*-
+++# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
 + 
 + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 + # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++@@ -14,8 +14,8 @@
++ 
++ m4_ifndef([AC_AUTOCONF_VERSION],
++   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
++-[m4_warning([this file was generated for autoconf 2.68.
+++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+++[m4_warning([this file was generated for autoconf 2.69.
++ You have another version of autoconf.  It may work, but is not guaranteed to.
++ If you have problems, you may need to regenerate the build system entirely.
++ To do so, use the procedure documented by the package, typically `autoreconf'.])])
 +@@ -680,7 +680,8 @@ AC_DEFUN([AM_NLS],
 + # ----------------------------------
 + AC_DEFUN([PKG_PROG_PKG_CONFIG],
 + [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 +-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 ++m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
 ++m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 + AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 + AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 + AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
 +@@ -726,7 +727,8 @@ m4_define([_PKG_CONFIG],
 +     pkg_cv_[]$1="$$1"
 +  elif test -n "$PKG_CONFIG"; then
 +     PKG_CHECK_EXISTS([$3],
 +-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 ++                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes ],
 + 		     [pkg_failed=yes])
 +  else
 +     pkg_failed=untried
 +@@ -774,9 +776,9 @@ if test $pkg_failed = yes; then
 +    	AC_MSG_RESULT([no])
 +         _PKG_SHORT_ERRORS_SUPPORTED
 +         if test $_pkg_short_errors_supported = yes; then
 +-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
 ++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
 +         else 
 +-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
 ++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
 +         fi
 + 	# Put the nasty error message in config.log where it belongs
 + 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 +@@ -789,7 +791,7 @@ $$1_PKG_ERRORS
 + Consider adjusting the PKG_CONFIG_PATH environment variable if you
 + installed software in a non-standard prefix.
 + 
 +-_PKG_TEXT])
 ++_PKG_TEXT])[]dnl
 +         ])
 + elif test $pkg_failed = untried; then
 +      	AC_MSG_RESULT([no])
 +@@ -800,7 +802,7 @@ path to pkg-config.
 + 
 + _PKG_TEXT
 + 
 +-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
 ++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
 +         ])
 + else
 + 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
 +@@ -1371,7 +1373,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 + [am__api_version='1.11'
 + dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 + dnl require some minimum version.  Point them to the right macro.
 +-m4_if([$1], [1.11.3], [],
- +m4_if([$1], [1.11.4], [],
+++m4_if([$1], [1.11.5], [],
 +       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 + ])
 + 
 +@@ -1387,7 +1389,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 + # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 + # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 + AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 +-[AM_AUTOMAKE_VERSION([1.11.3])dnl
- +[AM_AUTOMAKE_VERSION([1.11.4])dnl
+++[AM_AUTOMAKE_VERSION([1.11.5])dnl
 + m4_ifndef([AC_AUTOCONF_VERSION],
 +   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 + _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
++@@ -2472,7 +2474,6 @@ m4_include([m4/inttypes-pri.m4])
++ m4_include([m4/inttypes.m4])
++ m4_include([m4/inttypes_h.m4])
++ m4_include([m4/ioctl.m4])
++-m4_include([m4/largefile.m4])
++ m4_include([m4/lcmessage.m4])
++ m4_include([m4/lib-ld.m4])
++ m4_include([m4/lib-link.m4])
 +diff --git a/align/Makefile.in b/align/Makefile.in
- index f98e33b..03c3647 100644
++index 78a36e4..1148050 100644
 +--- a/align/Makefile.in
 ++++ b/align/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -238,6 +255,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(virt_alignment_scan_SOURCES)
 + DIST_SOURCES = $(virt_alignment_scan_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1371,8 +1393,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1373,8 +1395,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1541,11 +1566,18 @@ clean-libtool:
++@@ -1543,11 +1568,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/appliance/Makefile.in b/appliance/Makefile.in
- index de557ca..e9624a4 100644
++index c645284..e21c3f0 100644
 +--- a/appliance/Makefile.in
 ++++ b/appliance/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -50,6 +50,23 @@
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -112,24 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -196,6 +213,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1313,8 +1335,11 @@ clean-libtool:
++@@ -1315,8 +1337,11 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-fsDATA: $(fs_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(fsdir)" || $(MKDIR_P) "$(DESTDIR)$(fsdir)"
 + 	@list='$(fs_DATA)'; test -n "$(fsdir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(fsdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(fsdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(fsdir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
- @@ -1331,8 +1356,11 @@ uninstall-fsDATA:
++@@ -1333,8 +1358,11 @@ uninstall-fsDATA:
 + 	dir='$(DESTDIR)$(fsdir)'; $(am__uninstall_files_from_dir)
 + install-superminfsDATA: $(superminfs_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(superminfsdir)" || $(MKDIR_P) "$(DESTDIR)$(superminfsdir)"
 + 	@list='$(superminfs_DATA)'; test -n "$(superminfsdir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(superminfsdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(superminfsdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(superminfsdir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
 +diff --git a/build-aux/config.guess b/build-aux/config.guess
 +index dc84c68..40eaed4 100755
 +--- a/build-aux/config.guess
 ++++ b/build-aux/config.guess
 +@@ -1,10 +1,10 @@
 + #! /bin/sh
 + # Attempt to guess a canonical system name.
 + #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 +-#   Free Software Foundation, Inc.
 ++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 ++#   2011 Free Software Foundation, Inc.
 + 
 +-timestamp='2009-11-20'
 ++timestamp='2011-05-11'
 + 
 + # This file is free software; you can redistribute it and/or modify it
 + # under the terms of the GNU General Public License as published by
 +@@ -56,8 +56,9 @@ version="\
 + GNU config.guess ($timestamp)
 + 
 + Originally written by Per Bothner.
 +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
 +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
 ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 ++Software Foundation, Inc.
 + 
 + This is free software; see the source for copying conditions.  There is NO
 + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 +@@ -180,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 + 		fi
 + 		;;
 + 	    *)
 +-	        os=netbsd
 ++		os=netbsd
 + 		;;
 + 	esac
 + 	# The OS release
 +@@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 + 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 + 		;;
 + 	*5.*)
 +-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 ++		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 + 		;;
 + 	esac
 + 	# According to Compaq, /usr/sbin/psrinfo has been available on
 +@@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 + 	# A Xn.n version is an unreleased experimental baselevel.
 + 	# 1.2 uses "1.2" for uname -r.
 + 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 +-	exit ;;
 ++	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 ++	exitcode=$?
 ++	trap '' 0
 ++	exit $exitcode ;;
 +     Alpha\ *:Windows_NT*:*)
 + 	# How do we know it's Interix rather than the generic POSIX subsystem?
 + 	# Should we change UNAME_MACHINE based on the output of uname instead
 +@@ -295,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 + 	echo s390-ibm-zvmoe
 + 	exit ;;
 +     *:OS400:*:*)
 +-        echo powerpc-ibm-os400
 ++	echo powerpc-ibm-os400
 + 	exit ;;
 +     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 + 	echo arm-acorn-riscix${UNAME_RELEASE}
 +@@ -394,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 +     # MiNT.  But MiNT is downward compatible to TOS, so this should
 +     # be no problem.
 +     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
 +-        echo m68k-atari-mint${UNAME_RELEASE}
 ++	echo m68k-atari-mint${UNAME_RELEASE}
 + 	exit ;;
 +     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 + 	echo m68k-atari-mint${UNAME_RELEASE}
 +-        exit ;;
 ++	exit ;;
 +     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
 +-        echo m68k-atari-mint${UNAME_RELEASE}
 ++	echo m68k-atari-mint${UNAME_RELEASE}
 + 	exit ;;
 +     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
 +-        echo m68k-milan-mint${UNAME_RELEASE}
 +-        exit ;;
 ++	echo m68k-milan-mint${UNAME_RELEASE}
 ++	exit ;;
 +     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
 +-        echo m68k-hades-mint${UNAME_RELEASE}
 +-        exit ;;
 ++	echo m68k-hades-mint${UNAME_RELEASE}
 ++	exit ;;
 +     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
 +-        echo m68k-unknown-mint${UNAME_RELEASE}
 +-        exit ;;
 ++	echo m68k-unknown-mint${UNAME_RELEASE}
 ++	exit ;;
 +     m68k:machten:*:*)
 + 	echo m68k-apple-machten${UNAME_RELEASE}
 + 	exit ;;
 +@@ -480,8 +484,8 @@ EOF
 + 	echo m88k-motorola-sysv3
 + 	exit ;;
 +     AViiON:dgux:*:*)
 +-        # DG/UX returns AViiON for all architectures
 +-        UNAME_PROCESSOR=`/usr/bin/uname -p`
 ++	# DG/UX returns AViiON for all architectures
 ++	UNAME_PROCESSOR=`/usr/bin/uname -p`
 + 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 + 	then
 + 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
 +@@ -494,7 +498,7 @@ EOF
 + 	else
 + 	    echo i586-dg-dgux${UNAME_RELEASE}
 + 	fi
 +- 	exit ;;
 ++	exit ;;
 +     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 + 	echo m88k-dolphin-sysv3
 + 	exit ;;
 +@@ -551,7 +555,7 @@ EOF
 + 		echo rs6000-ibm-aix3.2
 + 	fi
 + 	exit ;;
 +-    *:AIX:*:[456])
 ++    *:AIX:*:[4567])
 + 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 + 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 + 		IBM_ARCH=rs6000
 +@@ -594,52 +598,52 @@ EOF
 + 	    9000/[678][0-9][0-9])
 + 		if [ -x /usr/bin/getconf ]; then
 + 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 +-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 +-                    case "${sc_cpu_version}" in
 +-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
 +-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 +-                      532)                      # CPU_PA_RISC2_0
 +-                        case "${sc_kernel_bits}" in
 +-                          32) HP_ARCH="hppa2.0n" ;;
 +-                          64) HP_ARCH="hppa2.0w" ;;
 ++		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 ++		    case "${sc_cpu_version}" in
 ++		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
 ++		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 ++		      532)                      # CPU_PA_RISC2_0
 ++			case "${sc_kernel_bits}" in
 ++			  32) HP_ARCH="hppa2.0n" ;;
 ++			  64) HP_ARCH="hppa2.0w" ;;
 + 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
 +-                        esac ;;
 +-                    esac
 ++			esac ;;
 ++		    esac
 + 		fi
 + 		if [ "${HP_ARCH}" = "" ]; then
 + 		    eval $set_cc_for_build
 +-		    sed 's/^              //' << EOF >$dummy.c
 ++		    sed 's/^		//' << EOF >$dummy.c
 + 
 +-              #define _HPUX_SOURCE
 +-              #include <stdlib.h>
 +-              #include <unistd.h>
 ++		#define _HPUX_SOURCE
 ++		#include <stdlib.h>
 ++		#include <unistd.h>
 + 
 +-              int main ()
 +-              {
 +-              #if defined(_SC_KERNEL_BITS)
 +-                  long bits = sysconf(_SC_KERNEL_BITS);
 +-              #endif
 +-                  long cpu  = sysconf (_SC_CPU_VERSION);
 ++		int main ()
 ++		{
 ++		#if defined(_SC_KERNEL_BITS)
 ++		    long bits = sysconf(_SC_KERNEL_BITS);
 ++		#endif
 ++		    long cpu  = sysconf (_SC_CPU_VERSION);
 + 
 +-                  switch (cpu)
 +-              	{
 +-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
 +-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
 +-              	case CPU_PA_RISC2_0:
 +-              #if defined(_SC_KERNEL_BITS)
 +-              	    switch (bits)
 +-              		{
 +-              		case 64: puts ("hppa2.0w"); break;
 +-              		case 32: puts ("hppa2.0n"); break;
 +-              		default: puts ("hppa2.0"); break;
 +-              		} break;
 +-              #else  /* !defined(_SC_KERNEL_BITS) */
 +-              	    puts ("hppa2.0"); break;
 +-              #endif
 +-              	default: puts ("hppa1.0"); break;
 +-              	}
 +-                  exit (0);
 +-              }
 ++		    switch (cpu)
 ++			{
 ++			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
 ++			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
 ++			case CPU_PA_RISC2_0:
 ++		#if defined(_SC_KERNEL_BITS)
 ++			    switch (bits)
 ++				{
 ++				case 64: puts ("hppa2.0w"); break;
 ++				case 32: puts ("hppa2.0n"); break;
 ++				default: puts ("hppa2.0"); break;
 ++				} break;
 ++		#else  /* !defined(_SC_KERNEL_BITS) */
 ++			    puts ("hppa2.0"); break;
 ++		#endif
 ++			default: puts ("hppa1.0"); break;
 ++			}
 ++		    exit (0);
 ++		}
 + EOF
 + 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 + 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 +@@ -730,22 +734,22 @@ EOF
 + 	exit ;;
 +     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 + 	echo c1-convex-bsd
 +-        exit ;;
 ++	exit ;;
 +     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 + 	if getsysinfo -f scalar_acc
 + 	then echo c32-convex-bsd
 + 	else echo c2-convex-bsd
 + 	fi
 +-        exit ;;
 ++	exit ;;
 +     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 + 	echo c34-convex-bsd
 +-        exit ;;
 ++	exit ;;
 +     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 + 	echo c38-convex-bsd
 +-        exit ;;
 ++	exit ;;
 +     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 + 	echo c4-convex-bsd
 +-        exit ;;
 ++	exit ;;
 +     CRAY*Y-MP:*:*:*)
 + 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 + 	exit ;;
 +@@ -769,14 +773,14 @@ EOF
 + 	exit ;;
 +     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 + 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 +-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 +-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 +-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 +-        exit ;;
 ++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 ++	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 ++	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 ++	exit ;;
 +     5000:UNIX_System_V:4.*:*)
 +-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 +-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 +-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 ++	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 ++	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 ++	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 + 	exit ;;
 +     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 + 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 +@@ -804,14 +808,14 @@ EOF
 + 	echo ${UNAME_MACHINE}-pc-mingw32
 + 	exit ;;
 +     i*:windows32*:*)
 +-    	# uname -m includes "-pc" on this system.
 +-    	echo ${UNAME_MACHINE}-mingw32
 ++	# uname -m includes "-pc" on this system.
 ++	echo ${UNAME_MACHINE}-mingw32
 + 	exit ;;
 +     i*:PW*:*)
 + 	echo ${UNAME_MACHINE}-pc-pw32
 + 	exit ;;
 +     *:Interix*:*)
 +-    	case ${UNAME_MACHINE} in
 ++	case ${UNAME_MACHINE} in
 + 	    x86)
 + 		echo i586-pc-interix${UNAME_RELEASE}
 + 		exit ;;
 +@@ -866,7 +870,7 @@ EOF
 + 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 + 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 + 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 +-        esac
 ++	esac
 + 	objdump --private-headers /bin/sh | grep -q ld.so.1
 + 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 + 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 +@@ -878,7 +882,13 @@ EOF
 + 	then
 + 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 + 	else
 +-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 ++	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 ++		| grep -q __ARM_PCS_VFP
 ++	    then
 ++		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 ++	    else
 ++		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
 ++	    fi
 + 	fi
 + 	exit ;;
 +     avr32*:Linux:*:*)
 +@@ -891,7 +901,7 @@ EOF
 + 	echo crisv32-axis-linux-gnu
 + 	exit ;;
 +     frv:Linux:*:*)
 +-    	echo frv-unknown-linux-gnu
 ++	echo frv-unknown-linux-gnu
 + 	exit ;;
 +     i*86:Linux:*:*)
 + 	LIBC=gnu
 +@@ -959,7 +969,7 @@ EOF
 + 	echo ${UNAME_MACHINE}-ibm-linux
 + 	exit ;;
 +     sh64*:Linux:*:*)
 +-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 ++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 + 	exit ;;
 +     sh*:Linux:*:*)
 + 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 +@@ -967,6 +977,9 @@ EOF
 +     sparc:Linux:*:* | sparc64:Linux:*:*)
 + 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 + 	exit ;;
 ++    tile*:Linux:*:*)
 ++	echo ${UNAME_MACHINE}-tilera-linux-gnu
 ++	exit ;;
 +     vax:Linux:*:*)
 + 	echo ${UNAME_MACHINE}-dec-linux-gnu
 + 	exit ;;
 +@@ -974,7 +987,7 @@ EOF
 + 	echo x86_64-unknown-linux-gnu
 + 	exit ;;
 +     xtensa*:Linux:*:*)
 +-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 ++	echo ${UNAME_MACHINE}-unknown-linux-gnu
 + 	exit ;;
 +     i*86:DYNIX/ptx:4*:*)
 + 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 +@@ -983,11 +996,11 @@ EOF
 + 	echo i386-sequent-sysv4
 + 	exit ;;
 +     i*86:UNIX_SV:4.2MP:2.*)
 +-        # Unixware is an offshoot of SVR4, but it has its own version
 +-        # number series starting with 2...
 +-        # I am not positive that other SVR4 systems won't match this,
 ++	# Unixware is an offshoot of SVR4, but it has its own version
 ++	# number series starting with 2...
 ++	# I am not positive that other SVR4 systems won't match this,
 + 	# I just have to hope.  -- rms.
 +-        # Use sysv4.2uw... so that sysv4* matches it.
 ++	# Use sysv4.2uw... so that sysv4* matches it.
 + 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 + 	exit ;;
 +     i*86:OS/2:*:*)
 +@@ -1019,7 +1032,7 @@ EOF
 + 	fi
 + 	exit ;;
 +     i*86:*:5:[678]*)
 +-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 ++	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 + 	case `/bin/uname -X | grep "^Machine"` in
 + 	    *486*)	     UNAME_MACHINE=i486 ;;
 + 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 +@@ -1047,13 +1060,13 @@ EOF
 + 	exit ;;
 +     pc:*:*:*)
 + 	# Left here for compatibility:
 +-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
 +-        # the processor, so we play safe by assuming i586.
 ++	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 ++	# the processor, so we play safe by assuming i586.
 + 	# Note: whatever this is, it MUST be the same as what config.sub
 + 	# prints for the "djgpp" host, or else GDB configury will decide that
 + 	# this is a cross-build.
 + 	echo i586-pc-msdosdjgpp
 +-        exit ;;
 ++	exit ;;
 +     Intel:Mach:3*:*)
 + 	echo i386-pc-mach3
 + 	exit ;;
 +@@ -1088,8 +1101,8 @@ EOF
 + 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 + 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 +     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 +-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 +-          && { echo i486-ncr-sysv4; exit; } ;;
 ++	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 ++	  && { echo i486-ncr-sysv4; exit; } ;;
 +     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 + 	OS_REL='.3'
 + 	test -r /etc/.relid \
 +@@ -1132,10 +1145,10 @@ EOF
 + 		echo ns32k-sni-sysv
 + 	fi
 + 	exit ;;
 +-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 +-                      # says <Richard.M.Bartel at ccMail.Census.GOV>
 +-        echo i586-unisys-sysv4
 +-        exit ;;
 ++    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 ++			# says <Richard.M.Bartel at ccMail.Census.GOV>
 ++	echo i586-unisys-sysv4
 ++	exit ;;
 +     *:UNIX_System_V:4*:FTX*)
 + 	# From Gerald Hewes <hewes at openmarket.com>.
 + 	# How about differentiating between stratus architectures? -djm
 +@@ -1161,11 +1174,11 @@ EOF
 + 	exit ;;
 +     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 + 	if [ -d /usr/nec ]; then
 +-	        echo mips-nec-sysv${UNAME_RELEASE}
 ++		echo mips-nec-sysv${UNAME_RELEASE}
 + 	else
 +-	        echo mips-unknown-sysv${UNAME_RELEASE}
 ++		echo mips-unknown-sysv${UNAME_RELEASE}
 + 	fi
 +-        exit ;;
 ++	exit ;;
 +     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 + 	echo powerpc-be-beos
 + 	exit ;;
 +@@ -1230,6 +1243,9 @@ EOF
 +     *:QNX:*:4*)
 + 	echo i386-pc-qnx
 + 	exit ;;
 ++    NEO-?:NONSTOP_KERNEL:*:*)
 ++	echo neo-tandem-nsk${UNAME_RELEASE}
 ++	exit ;;
 +     NSE-?:NONSTOP_KERNEL:*:*)
 + 	echo nse-tandem-nsk${UNAME_RELEASE}
 + 	exit ;;
 +@@ -1275,13 +1291,13 @@ EOF
 + 	echo pdp10-unknown-its
 + 	exit ;;
 +     SEI:*:*:SEIUX)
 +-        echo mips-sei-seiux${UNAME_RELEASE}
 ++	echo mips-sei-seiux${UNAME_RELEASE}
 + 	exit ;;
 +     *:DragonFly:*:*)
 + 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 + 	exit ;;
 +     *:*VMS:*:*)
 +-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 ++	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 + 	case "${UNAME_MACHINE}" in
 + 	    A*) echo alpha-dec-vms ; exit ;;
 + 	    I*) echo ia64-dec-vms ; exit ;;
 +@@ -1321,11 +1337,11 @@ main ()
 + #include <sys/param.h>
 +   printf ("m68k-sony-newsos%s\n",
 + #ifdef NEWSOS4
 +-          "4"
 ++	"4"
 + #else
 +-	  ""
 ++	""
 + #endif
 +-         ); exit (0);
 ++	); exit (0);
 + #endif
 + #endif
 + 
 +diff --git a/build-aux/config.sub b/build-aux/config.sub
 +index 2a55a50..30fdca8 100755
 +--- a/build-aux/config.sub
 ++++ b/build-aux/config.sub
 +@@ -1,10 +1,10 @@
 + #! /bin/sh
 + # Configuration validation subroutine script.
 + #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 +-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 +-#   Free Software Foundation, Inc.
 ++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 ++#   2011 Free Software Foundation, Inc.
 + 
 +-timestamp='2009-11-20'
 ++timestamp='2011-03-23'
 + 
 + # This file is (in principle) common to ALL GNU software.
 + # The presence of a machine in this file suggests that SOME GNU software
 +@@ -75,8 +75,9 @@ Report bugs and patches to <config-patches at gnu.org>."
 + version="\
 + GNU config.sub ($timestamp)
 + 
 +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
 +-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
 ++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 ++Software Foundation, Inc.
 + 
 + This is free software; see the source for copying conditions.  There is NO
 + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 +@@ -123,8 +124,9 @@ esac
 + # Here we must recognize all the valid KERNEL-OS combinations.
 + maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 + case $maybe_os in
 +-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
 +-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
 ++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
 ++  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
 ++  knetbsd*-gnu* | netbsd*-gnu* | \
 +   kopensolaris*-gnu* | \
 +   storm-chaos* | os2-emx* | rtmk-nova*)
 +     os=-$maybe_os
 +@@ -156,8 +158,8 @@ case $os in
 + 		os=
 + 		basic_machine=$1
 + 		;;
 +-        -bluegene*)
 +-	        os=-cnk
 ++	-bluegene*)
 ++		os=-cnk
 + 		;;
 + 	-sim | -cisco | -oki | -wec | -winbond)
 + 		os=
 +@@ -173,10 +175,10 @@ case $os in
 + 		os=-chorusos
 + 		basic_machine=$1
 + 		;;
 +- 	-chorusrdb)
 +- 		os=-chorusrdb
 ++	-chorusrdb)
 ++		os=-chorusrdb
 + 		basic_machine=$1
 +- 		;;
 ++		;;
 + 	-hiux*)
 + 		os=-hiuxwe2
 + 		;;
 +@@ -281,11 +283,13 @@ case $basic_machine in
 + 	| moxie \
 + 	| mt \
 + 	| msp430 \
 ++	| nds32 | nds32le | nds32be \
 + 	| nios | nios2 \
 + 	| ns16k | ns32k \
 ++	| open8 \
 + 	| or32 \
 + 	| pdp10 | pdp11 | pj | pjl \
 +-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 ++	| powerpc | powerpc64 | powerpc64le | powerpcle \
 + 	| pyramid \
 + 	| rx \
 + 	| score \
 +@@ -293,15 +297,24 @@ case $basic_machine in
 + 	| sh64 | sh64le \
 + 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 + 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 +-	| spu | strongarm \
 +-	| tahoe | thumb | tic4x | tic80 | tron \
 ++	| spu \
 ++	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 + 	| ubicom32 \
 + 	| v850 | v850e \
 + 	| we32k \
 +-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 ++	| x86 | xc16x | xstormy16 | xtensa \
 + 	| z8k | z80)
 + 		basic_machine=$basic_machine-unknown
 + 		;;
 ++	c54x)
 ++		basic_machine=tic54x-unknown
 ++		;;
 ++	c55x)
 ++		basic_machine=tic55x-unknown
 ++		;;
 ++	c6x)
 ++		basic_machine=tic6x-unknown
 ++		;;
 + 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 + 		# Motorola 68HC11/12.
 + 		basic_machine=$basic_machine-unknown
 +@@ -313,6 +326,18 @@ case $basic_machine in
 + 		basic_machine=mt-unknown
 + 		;;
 + 
 ++	strongarm | thumb | xscale)
 ++		basic_machine=arm-unknown
 ++		;;
 ++
 ++	xscaleeb)
 ++		basic_machine=armeb-unknown
 ++		;;
 ++
 ++	xscaleel)
 ++		basic_machine=armel-unknown
 ++		;;
 ++
 + 	# We use `pc' rather than `unknown'
 + 	# because (1) that's what they normally are, and
 + 	# (2) the word "unknown" tends to confuse beginning users.
 +@@ -333,7 +358,7 @@ case $basic_machine in
 + 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 + 	| avr-* | avr32-* \
 + 	| bfin-* | bs2000-* \
 +-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 ++	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 + 	| clipper-* | craynv-* | cydra-* \
 + 	| d10v-* | d30v-* | dlx-* \
 + 	| elxsi-* \
 +@@ -367,25 +392,28 @@ case $basic_machine in
 + 	| mmix-* \
 + 	| mt-* \
 + 	| msp430-* \
 ++	| nds32-* | nds32le-* | nds32be-* \
 + 	| nios-* | nios2-* \
 + 	| none-* | np1-* | ns16k-* | ns32k-* \
 ++	| open8-* \
 + 	| orion-* \
 + 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 +-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 ++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 + 	| pyramid-* \
 + 	| romp-* | rs6000-* | rx-* \
 + 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 + 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 + 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 + 	| sparclite-* \
 +-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 +-	| tahoe-* | thumb-* \
 +-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 ++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 ++	| tahoe-* \
 ++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 ++	| tile-* | tilegx-* \
 + 	| tron-* \
 + 	| ubicom32-* \
 + 	| v850-* | v850e-* | vax-* \
 + 	| we32k-* \
 +-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 ++	| x86-* | x86_64-* | xc16x-* | xps100-* \
 + 	| xstormy16-* | xtensa*-* \
 + 	| ymp-* \
 + 	| z8k-* | z80-*)
 +@@ -410,7 +438,7 @@ case $basic_machine in
 + 		basic_machine=a29k-amd
 + 		os=-udi
 + 		;;
 +-    	abacus)
 ++	abacus)
 + 		basic_machine=abacus-unknown
 + 		;;
 + 	adobe68k)
 +@@ -480,11 +508,20 @@ case $basic_machine in
 + 		basic_machine=powerpc-ibm
 + 		os=-cnk
 + 		;;
 ++	c54x-*)
 ++		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
 ++		;;
 ++	c55x-*)
 ++		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
 ++		;;
 ++	c6x-*)
 ++		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
 ++		;;
 + 	c90)
 + 		basic_machine=c90-cray
 + 		os=-unicos
 + 		;;
 +-        cegcc)
 ++	cegcc)
 + 		basic_machine=arm-unknown
 + 		os=-cegcc
 + 		;;
 +@@ -516,7 +553,7 @@ case $basic_machine in
 + 		basic_machine=craynv-cray
 + 		os=-unicosmp
 + 		;;
 +-	cr16)
 ++	cr16 | cr16-*)
 + 		basic_machine=cr16-unknown
 + 		os=-elf
 + 		;;
 +@@ -732,7 +769,7 @@ case $basic_machine in
 + 		basic_machine=ns32k-utek
 + 		os=-sysv
 + 		;;
 +-        microblaze)
 ++	microblaze)
 + 		basic_machine=microblaze-xilinx
 + 		;;
 + 	mingw32)
 +@@ -839,6 +876,12 @@ case $basic_machine in
 + 	np1)
 + 		basic_machine=np1-gould
 + 		;;
 ++	neo-tandem)
 ++		basic_machine=neo-tandem
 ++		;;
 ++	nse-tandem)
 ++		basic_machine=nse-tandem
 ++		;;
 + 	nsr-tandem)
 + 		basic_machine=nsr-tandem
 + 		;;
 +@@ -921,9 +964,10 @@ case $basic_machine in
 + 		;;
 + 	power)	basic_machine=power-ibm
 + 		;;
 +-	ppc)	basic_machine=powerpc-unknown
 ++	ppc | ppcbe)	basic_machine=powerpc-unknown
 + 		;;
 +-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 ++	ppc-* | ppcbe-*)
 ++		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 + 		;;
 + 	ppcle | powerpclittle | ppc-le | powerpc-little)
 + 		basic_machine=powerpcle-unknown
 +@@ -1017,6 +1061,9 @@ case $basic_machine in
 + 		basic_machine=i860-stratus
 + 		os=-sysv4
 + 		;;
 ++	strongarm-* | thumb-*)
 ++		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
 ++		;;
 + 	sun2)
 + 		basic_machine=m68000-sun
 + 		;;
 +@@ -1073,17 +1120,10 @@ case $basic_machine in
 + 		basic_machine=t90-cray
 + 		os=-unicos
 + 		;;
 +-	tic54x | c54x*)
 +-		basic_machine=tic54x-unknown
 +-		os=-coff
 +-		;;
 +-	tic55x | c55x*)
 +-		basic_machine=tic55x-unknown
 +-		os=-coff
 +-		;;
 +-	tic6x | c6x*)
 +-		basic_machine=tic6x-unknown
 +-		os=-coff
 ++	# This must be matched before tile*.
 ++	tilegx*)
 ++		basic_machine=tilegx-unknown
 ++		os=-linux-gnu
 + 		;;
 + 	tile*)
 + 		basic_machine=tile-unknown
 +@@ -1156,6 +1196,9 @@ case $basic_machine in
 + 	xps | xps100)
 + 		basic_machine=xps100-honeywell
 + 		;;
 ++	xscale-* | xscalee[bl]-*)
 ++		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
 ++		;;
 + 	ymp)
 + 		basic_machine=ymp-cray
 + 		os=-unicos
 +@@ -1253,11 +1296,11 @@ esac
 + if [ x"$os" != x"" ]
 + then
 + case $os in
 +-        # First match some system type aliases
 +-        # that might get confused with valid system types.
 ++	# First match some system type aliases
 ++	# that might get confused with valid system types.
 + 	# -solaris* is a basic system type, with this one exception.
 +-        -auroraux)
 +-	        os=-auroraux
 ++	-auroraux)
 ++		os=-auroraux
 + 		;;
 + 	-solaris1 | -solaris1.*)
 + 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 +@@ -1294,7 +1337,8 @@ case $os in
 + 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 + 	      | -chorusos* | -chorusrdb* | -cegcc* \
 + 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 +-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 ++	      | -mingw32* | -linux-gnu* | -linux-android* \
 ++	      | -linux-newlib* | -linux-uclibc* \
 + 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 + 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 + 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 +@@ -1341,7 +1385,7 @@ case $os in
 + 	-opened*)
 + 		os=-openedition
 + 		;;
 +-        -os400*)
 ++	-os400*)
 + 		os=-os400
 + 		;;
 + 	-wince*)
 +@@ -1390,7 +1434,7 @@ case $os in
 + 	-sinix*)
 + 		os=-sysv4
 + 		;;
 +-        -tpf*)
 ++	-tpf*)
 + 		os=-tpf
 + 		;;
 + 	-triton*)
 +@@ -1435,6 +1479,8 @@ case $os in
 + 	-dicos*)
 + 		os=-dicos
 + 		;;
 ++	-nacl*)
 ++		;;
 + 	-none)
 + 		;;
 + 	*)
 +@@ -1457,10 +1503,10 @@ else
 + # system, and we'll never get to this point.
 + 
 + case $basic_machine in
 +-        score-*)
 ++	score-*)
 + 		os=-elf
 + 		;;
 +-        spu-*)
 ++	spu-*)
 + 		os=-elf
 + 		;;
 + 	*-acorn)
 +@@ -1472,8 +1518,17 @@ case $basic_machine in
 + 	arm*-semi)
 + 		os=-aout
 + 		;;
 +-        c4x-* | tic4x-*)
 +-        	os=-coff
 ++	c4x-* | tic4x-*)
 ++		os=-coff
 ++		;;
 ++	tic54x-*)
 ++		os=-coff
 ++		;;
 ++	tic55x-*)
 ++		os=-coff
 ++		;;
 ++	tic6x-*)
 ++		os=-coff
 + 		;;
 + 	# This must come before the *-dec entry.
 + 	pdp10-*)
 +@@ -1500,7 +1555,7 @@ case $basic_machine in
 + 	m68*-cisco)
 + 		os=-aout
 + 		;;
 +-        mep-*)
 ++	mep-*)
 + 		os=-elf
 + 		;;
 + 	mips*-cisco)
 +@@ -1527,7 +1582,7 @@ case $basic_machine in
 + 	*-ibm)
 + 		os=-aix
 + 		;;
 +-    	*-knuth)
 ++	*-knuth)
 + 		os=-mmixware
 + 		;;
 + 	*-wec)
 +diff --git a/cat/Makefile.in b/cat/Makefile.in
- index 7e4b552..ca26101 100644
++index 0331bc6..2a44893 100644
 +--- a/cat/Makefile.in
 ++++ b/cat/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -114,24 +131,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -260,6 +277,11 @@ SOURCES = $(virt_cat_SOURCES) $(virt_filesystems_SOURCES) \
 + 	$(virt_ls_SOURCES)
 + DIST_SOURCES = $(virt_cat_SOURCES) $(virt_filesystems_SOURCES) \
 + 	$(virt_ls_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1445,8 +1467,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1447,8 +1469,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1801,11 +1826,18 @@ clean-libtool:
++@@ -1803,11 +1828,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/clone/Makefile.in b/clone/Makefile.in
- index 22a1b59..0fde6e7 100644
++index 83fa243..64d1ce5 100644
 +--- a/clone/Makefile.in
 ++++ b/clone/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -112,24 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -225,6 +242,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + man1dir = $(mandir)/man1
 + NROFF = nroff
 + MANS = $(man_MANS)
- @@ -1313,8 +1335,11 @@ virt-sysprep: $(top_builddir)/config.status $(srcdir)/virt-sysprep.in
++@@ -1315,8 +1337,11 @@ virt-sysprep: $(top_builddir)/config.status $(srcdir)/virt-sysprep.in
 + 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 + install-binSCRIPTS: $(bin_SCRIPTS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- @@ -1351,11 +1376,18 @@ clean-libtool:
++@@ -1353,11 +1378,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
++diff --git a/config.h.in b/config.h.in
++index c6e3ec0..b82c28c 100644
++--- a/config.h.in
+++++ b/config.h.in
++@@ -21,12 +21,12 @@
++ /* Name of bmptopnm program. */
++ #undef BMPTOPNM
++ 
++-/* Define to one of '_getb67', 'GETB67', 'getb67' for Cray-2 and Cray-YMP
++-   systems. This function is required for 'alloca.c' support on those systems.
+++/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+++   systems. This function is required for `alloca.c' support on those systems.
++    */
++ #undef CRAY_STACKSEG_END
++ 
++-/* Define to 1 if using 'alloca.c'. */
+++/* Define to 1 if using `alloca.c'. */
++ #undef C_ALLOCA
++ 
++ /* Define as the bit index in the word where to find bit 0 of the exponent of
++@@ -2070,9 +2070,9 @@
++ /* If using the C implementation of alloca, define if you know the
++    direction of stack growth for your system; otherwise it will be
++    automatically deduced at runtime.
++-        STACK_DIRECTION > 0 => grows toward higher addresses
++-        STACK_DIRECTION < 0 => grows toward lower addresses
++-        STACK_DIRECTION = 0 => direction of growth unknown */
+++	STACK_DIRECTION > 0 => grows toward higher addresses
+++	STACK_DIRECTION < 0 => grows toward lower addresses
+++	STACK_DIRECTION = 0 => direction of growth unknown */
++ #undef STACK_DIRECTION
++ 
++ /* Define if the block counts reported by statfs may be truncated to 2GB and
++@@ -2184,7 +2184,7 @@
++ /* Name of wrestool program. */
++ #undef WRESTOOL
++ 
++-/* Enable large inode numbers on Mac OS X.  */
+++/* Enable large inode numbers on Mac OS X 10.5.  */
++ #ifndef _DARWIN_USE_64_BIT_INODE
++ # define _DARWIN_USE_64_BIT_INODE 1
++ #endif
 +diff --git a/configure b/configure
- index f733fcf..560c007 100755
++index c7a0657..9bcd0e7 100755
 +--- a/configure
 ++++ b/configure
- @@ -45988,6 +45988,7 @@ fi
++@@ -1,11 +1,9 @@
++ #! /bin/sh
++ # Guess values for system-dependent variables and create Makefiles.
++-# Generated by GNU Autoconf 2.68 for libguestfs 1.16.21.
+++# Generated by GNU Autoconf 2.69 for libguestfs 1.16.21.
++ #
++ #
++-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++-# Foundation, Inc.
+++# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
++ #
++ #
++ # This configure script is free software; the Free Software Foundation
++@@ -134,6 +132,31 @@ export LANGUAGE
++ # CDPATH.
++ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++ 
+++# Use a proper internal environment variable to ensure we don't fall
+++  # into an infinite loop, continuously re-executing ourselves.
+++  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+++    _as_can_reexec=no; export _as_can_reexec;
+++    # We cannot yet assume a decent shell, so we have to provide a
+++# neutralization value for shells without unset; and this also
+++# works around shells that cannot unset nonexistent variables.
+++# Preserve -v and -x to the replacement shell.
+++BASH_ENV=/dev/null
+++ENV=/dev/null
+++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+++case $- in # ((((
+++  *v*x* | *x*v* ) as_opts=-vx ;;
+++  *v* ) as_opts=-v ;;
+++  *x* ) as_opts=-x ;;
+++  * ) as_opts= ;;
+++esac
+++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+++# Admittedly, this is quite paranoid, since all the known shells bail
+++# out after a failed `exec'.
+++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+++as_fn_exit 255
+++  fi
+++  # We don't want this to propagate to other subprocesses.
+++          { _as_can_reexec=; unset _as_can_reexec;}
++ if test "x$CONFIG_SHELL" = x; then
++   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
++   emulate sh
++@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
++ else
++   exitcode=1; echo positional parameters were not saved.
++ fi
++-test x\$exitcode = x0 || exit 1"
+++test x\$exitcode = x0 || exit 1
+++test -x / || exit 1"
++   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
++   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
++   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
++@@ -220,21 +244,25 @@ IFS=$as_save_IFS
++ 
++ 
++       if test "x$CONFIG_SHELL" != x; then :
++-  # We cannot yet assume a decent shell, so we have to provide a
++-	# neutralization value for shells without unset; and this also
++-	# works around shells that cannot unset nonexistent variables.
++-	# Preserve -v and -x to the replacement shell.
++-	BASH_ENV=/dev/null
++-	ENV=/dev/null
++-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
++-	export CONFIG_SHELL
++-	case $- in # ((((
++-	  *v*x* | *x*v* ) as_opts=-vx ;;
++-	  *v* ) as_opts=-v ;;
++-	  *x* ) as_opts=-x ;;
++-	  * ) as_opts= ;;
++-	esac
++-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+++  export CONFIG_SHELL
+++             # We cannot yet assume a decent shell, so we have to provide a
+++# neutralization value for shells without unset; and this also
+++# works around shells that cannot unset nonexistent variables.
+++# Preserve -v and -x to the replacement shell.
+++BASH_ENV=/dev/null
+++ENV=/dev/null
+++(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+++case $- in # ((((
+++  *v*x* | *x*v* ) as_opts=-vx ;;
+++  *v* ) as_opts=-v ;;
+++  *x* ) as_opts=-x ;;
+++  * ) as_opts= ;;
+++esac
+++exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+++# Admittedly, this is quite paranoid, since all the known shells bail
+++# out after a failed `exec'.
+++$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+++exit 255
++ fi
++ 
++     if test x$as_have_required = xno; then :
++@@ -336,6 +364,14 @@ $as_echo X"$as_dir" |
++ 
++ 
++ } # as_fn_mkdir_p
+++
+++# as_fn_executable_p FILE
+++# -----------------------
+++# Test if FILE is an executable regular file.
+++as_fn_executable_p ()
+++{
+++  test -f "$1" && test -x "$1"
+++} # as_fn_executable_p
++ # as_fn_append VAR VALUE
++ # ----------------------
++ # Append the text in VALUE to the end of the definition contained in VAR. Take
++@@ -457,6 +493,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
++   chmod +x "$as_me.lineno" ||
++     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
++ 
+++  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+++  # already done that, so ensure we don't try to do so again and fall
+++  # in an infinite loop.  This has already happened in practice.
+++  _as_can_reexec=no; export _as_can_reexec
++   # Don't try to exec as it changes $[0], causing all sort of problems
++   # (the dirname of $[0] is not the place where we might find the
++   # original and so on.  Autoconf is especially sensitive to this).
++@@ -491,16 +531,16 @@ if (echo >conf$$.file) 2>/dev/null; then
++     # ... but there are two gotchas:
++     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++-    # In both cases, we have to default to `cp -p'.
+++    # In both cases, we have to default to `cp -pR'.
++     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++-      as_ln_s='cp -p'
+++      as_ln_s='cp -pR'
++   elif ln conf$$.file conf$$ 2>/dev/null; then
++     as_ln_s=ln
++   else
++-    as_ln_s='cp -p'
+++    as_ln_s='cp -pR'
++   fi
++ else
++-  as_ln_s='cp -p'
+++  as_ln_s='cp -pR'
++ fi
++ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++ rmdir conf$$.dir 2>/dev/null
++@@ -512,28 +552,8 @@ else
++   as_mkdir_p=false
++ fi
++ 
++-if test -x / >/dev/null 2>&1; then
++-  as_test_x='test -x'
++-else
++-  if ls -dL / >/dev/null 2>&1; then
++-    as_ls_L_option=L
++-  else
++-    as_ls_L_option=
++-  fi
++-  as_test_x='
++-    eval sh -c '\''
++-      if test -d "$1"; then
++-	test -d "$1/.";
++-      else
++-	case $1 in #(
++-	-*)set "./$1";;
++-	esac;
++-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
++-	???[sx]*):;;*)false;;esac;fi
++-    '\'' sh
++-  '
++-fi
++-as_executable_p=$as_test_x
+++as_test_x='test -x'
+++as_executable_p=as_fn_executable_p
++ 
++ # Sed expression to map a string onto a valid CPP name.
++ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++@@ -2250,8 +2270,6 @@ target=$target_alias
++ if test "x$host_alias" != x; then
++   if test "x$build_alias" = x; then
++     cross_compiling=maybe
++-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++-    If a cross compiler is detected then cross compile mode will be used" >&2
++   elif test "x$build_alias" != "x$host_alias"; then
++     cross_compiling=yes
++   fi
++@@ -2591,9 +2609,9 @@ test -n "$ac_init_help" && exit $ac_status
++ if $ac_init_version; then
++   cat <<\_ACEOF
++ libguestfs configure 1.16.21
++-generated by GNU Autoconf 2.68
+++generated by GNU Autoconf 2.69
++ 
++-Copyright (C) 2010 Free Software Foundation, Inc.
+++Copyright (C) 2012 Free Software Foundation, Inc.
++ This configure script is free software; the Free Software Foundation
++ gives unlimited permission to copy, distribute and modify it.
++ _ACEOF
++@@ -2866,7 +2884,7 @@ $as_echo "$ac_try_echo"; } >&5
++ 	 test ! -s conftest.err
++        } && test -s conftest$ac_exeext && {
++ 	 test "$cross_compiling" = yes ||
++-	 $as_test_x conftest$ac_exeext
+++	 test -x conftest$ac_exeext
++        }; then :
++   ac_retval=0
++ else
++@@ -3126,7 +3144,8 @@ int
++ main ()
++ {
++ static int test_array [1 - 2 * !(($2) >= 0)];
++-test_array [0] = 0
+++test_array [0] = 0;
+++return test_array [0];
++ 
++   ;
++   return 0;
++@@ -3142,7 +3161,8 @@ int
++ main ()
++ {
++ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
++-test_array [0] = 0
+++test_array [0] = 0;
+++return test_array [0];
++ 
++   ;
++   return 0;
++@@ -3168,7 +3188,8 @@ int
++ main ()
++ {
++ static int test_array [1 - 2 * !(($2) < 0)];
++-test_array [0] = 0
+++test_array [0] = 0;
+++return test_array [0];
++ 
++   ;
++   return 0;
++@@ -3184,7 +3205,8 @@ int
++ main ()
++ {
++ static int test_array [1 - 2 * !(($2) >= $ac_mid)];
++-test_array [0] = 0
+++test_array [0] = 0;
+++return test_array [0];
++ 
++   ;
++   return 0;
++@@ -3218,7 +3240,8 @@ int
++ main ()
++ {
++ static int test_array [1 - 2 * !(($2) <= $ac_mid)];
++-test_array [0] = 0
+++test_array [0] = 0;
+++return test_array [0];
++ 
++   ;
++   return 0;
++@@ -3333,7 +3356,7 @@ This file contains any messages produced by compilers while
++ running configure, to aid debugging if configure makes a mistake.
++ 
++ It was created by libguestfs $as_me 1.16.21, which was
++-generated by GNU Autoconf 2.68.  Invocation command line was
+++generated by GNU Autoconf 2.69.  Invocation command line was
++ 
++   $ $0 $@
++ 
++@@ -3829,7 +3852,7 @@ case $as_dir/ in #((
++     # by default.
++     for ac_prog in ginstall scoinst install; do
++       for ac_exec_ext in '' $ac_executable_extensions; do
++-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+++	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++ 	  if test $ac_prog = install &&
++ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++ 	    # AIX install.  It has an incompatible calling convention.
++@@ -3998,7 +4021,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -4038,7 +4061,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_STRIP="strip"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -4089,7 +4112,7 @@ do
++   test -z "$as_dir" && as_dir=.
++     for ac_prog in mkdir gmkdir; do
++ 	 for ac_exec_ext in '' $ac_executable_extensions; do
++-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+++	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
++ 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
++ 	     'mkdir (GNU coreutils) '* | \
++ 	     'mkdir (coreutils) '* | \
++@@ -4143,7 +4166,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_AWK="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -4456,7 +4479,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_CC="${ac_tool_prefix}gcc"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -4496,7 +4519,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_CC="gcc"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -4549,7 +4572,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_CC="${ac_tool_prefix}cc"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -4590,7 +4613,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++        ac_prog_rejected=yes
++        continue
++@@ -4648,7 +4671,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -4692,7 +4715,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_CC="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -5138,8 +5161,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ /* end confdefs.h.  */
++ #include <stdarg.h>
++ #include <stdio.h>
++-#include <sys/types.h>
++-#include <sys/stat.h>
+++struct stat;
++ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++ struct buf { int x; };
++ FILE * (*rcsopen) (struct buf *, struct stat *, int);
++@@ -5507,7 +5529,7 @@ do
++     for ac_prog in grep ggrep; do
++     for ac_exec_ext in '' $ac_executable_extensions; do
++       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+++      as_fn_executable_p "$ac_path_GREP" || continue
++ # Check for GNU ac_path_GREP and select it if it is found.
++   # Check for GNU $ac_path_GREP
++ case `"$ac_path_GREP" --version 2>&1` in
++@@ -5573,7 +5595,7 @@ do
++     for ac_prog in egrep; do
++     for ac_exec_ext in '' $ac_executable_extensions; do
++       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+++      as_fn_executable_p "$ac_path_EGREP" || continue
++ # Check for GNU ac_path_EGREP and select it if it is found.
++   # Check for GNU $ac_path_EGREP
++ case `"$ac_path_EGREP" --version 2>&1` in
++@@ -5673,7 +5695,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_AR="${ac_tool_prefix}ar"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -5713,7 +5735,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_AR="ar"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -5780,7 +5802,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -5820,7 +5842,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_RANLIB="ranlib"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -6375,9 +6397,9 @@ else
++      if test "$GCC" != yes; then
++        ac_save_CC=$CC
++        while :; do
++-         # IRIX 6.2 and later do not support large files by default,
++-         # so use the C compiler's -n32 option if that helps.
++-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+++	 # IRIX 6.2 and later do not support large files by default,
+++	 # so use the C compiler's -n32 option if that helps.
+++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ /* end confdefs.h.  */
++ #include <sys/types.h>
++  /* Check that off_t can represent 2**63 - 1 correctly.
++@@ -6386,8 +6408,8 @@ else
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -6396,16 +6418,16 @@ main ()
++   return 0;
++ }
++ _ACEOF
++-         if ac_fn_c_try_compile "$LINENO"; then :
+++	 if ac_fn_c_try_compile "$LINENO"; then :
++   break
++ fi
++ rm -f core conftest.err conftest.$ac_objext
++-         CC="$CC -n32"
++-         if ac_fn_c_try_compile "$LINENO"; then :
+++	 CC="$CC -n32"
+++	 if ac_fn_c_try_compile "$LINENO"; then :
++   ac_cv_sys_largefile_CC=' -n32'; break
++ fi
++ rm -f core conftest.err conftest.$ac_objext
++-         break
+++	 break
++        done
++        CC=$ac_save_CC
++        rm -f conftest.$ac_ext
++@@ -6432,8 +6454,8 @@ else
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -6456,8 +6478,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -6501,8 +6523,8 @@ else
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -6525,8 +6547,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -6709,7 +6731,7 @@ main ()
++   return 0;
++ }
++ _ACEOF
++-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+++for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
++ do
++   CC="$ac_save_CC $ac_arg"
++   if ac_fn_c_try_compile "$LINENO"; then :
++@@ -6749,8 +6771,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ /* end confdefs.h.  */
++ #include <stdarg.h>
++ #include <stdio.h>
++-#include <sys/types.h>
++-#include <sys/stat.h>
+++struct stat;
++ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++ struct buf { int x; };
++ FILE * (*rcsopen) (struct buf *, struct stat *, int);
++@@ -7406,8 +7427,8 @@ ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
++ $as_echo "#define C_ALLOCA 1" >>confdefs.h
++ 
++ 
++-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether 'alloca.c' needs Cray hooks" >&5
++-$as_echo_n "checking whether 'alloca.c' needs Cray hooks... " >&6; }
+++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+++$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
++ if ${ac_cv_os_cray+:} false; then :
++   $as_echo_n "(cached) " >&6
++ else
++@@ -36968,7 +36989,7 @@ do
++     for ac_prog in sed gsed; do
++     for ac_exec_ext in '' $ac_executable_extensions; do
++       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
++-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+++      as_fn_executable_p "$ac_path_SED" || continue
++ # Check for GNU ac_path_SED and select it if it is found.
++   # Check for GNU $ac_path_SED
++ case `"$ac_path_SED" --version 2>&1` in
++@@ -37047,7 +37068,7 @@ do
++     for ac_prog in fgrep; do
++     for ac_exec_ext in '' $ac_executable_extensions; do
++       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
++-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+++      as_fn_executable_p "$ac_path_FGREP" || continue
++ # Check for GNU ac_path_FGREP and select it if it is found.
++   # Check for GNU $ac_path_FGREP
++ case `"$ac_path_FGREP" --version 2>&1` in
++@@ -37303,7 +37324,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -37347,7 +37368,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -37771,7 +37792,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -37811,7 +37832,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OBJDUMP="objdump"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -38117,7 +38138,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -38157,7 +38178,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -38260,7 +38281,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -38304,7 +38325,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_AR="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -38429,7 +38450,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -38469,7 +38490,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_STRIP="strip"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -38528,7 +38549,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -38568,7 +38589,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_RANLIB="ranlib"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39217,7 +39238,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39257,7 +39278,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39337,7 +39358,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39377,7 +39398,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39429,7 +39450,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39469,7 +39490,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_NMEDIT="nmedit"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39521,7 +39542,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39561,7 +39582,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_LIPO="lipo"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39613,7 +39634,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39653,7 +39674,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OTOOL="otool"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39705,7 +39726,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -39745,7 +39766,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OTOOL64="otool64"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -43992,7 +44013,7 @@ do
++     for ac_prog in sed gsed; do
++     for ac_exec_ext in '' $ac_executable_extensions; do
++       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
++-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+++      as_fn_executable_p "$ac_path_SED" || continue
++ # Check for GNU ac_path_SED and select it if it is found.
++   # Check for GNU $ac_path_SED
++ case `"$ac_path_SED" --version 2>&1` in
++@@ -44190,7 +44211,7 @@ main ()
++   return 0;
++ }
++ _ACEOF
++-for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99
+++for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
++ do
++   CC="$ac_save_CC $ac_arg"
++   if ac_fn_c_try_compile "$LINENO"; then :
++@@ -44230,8 +44251,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ /* end confdefs.h.  */
++ #include <stdarg.h>
++ #include <stdio.h>
++-#include <sys/types.h>
++-#include <sys/stat.h>
+++struct stat;
++ /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++ struct buf { int x; };
++ FILE * (*rcsopen) (struct buf *, struct stat *, int);
++@@ -45111,9 +45131,9 @@ else
++      if test "$GCC" != yes; then
++        ac_save_CC=$CC
++        while :; do
++-         # IRIX 6.2 and later do not support large files by default,
++-         # so use the C compiler's -n32 option if that helps.
++-         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+++	 # IRIX 6.2 and later do not support large files by default,
+++	 # so use the C compiler's -n32 option if that helps.
+++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ /* end confdefs.h.  */
++ #include <sys/types.h>
++  /* Check that off_t can represent 2**63 - 1 correctly.
++@@ -45122,8 +45142,8 @@ else
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -45132,16 +45152,16 @@ main ()
++   return 0;
++ }
++ _ACEOF
++-         if ac_fn_c_try_compile "$LINENO"; then :
+++	 if ac_fn_c_try_compile "$LINENO"; then :
++   break
++ fi
++ rm -f core conftest.err conftest.$ac_objext
++-         CC="$CC -n32"
++-         if ac_fn_c_try_compile "$LINENO"; then :
+++	 CC="$CC -n32"
+++	 if ac_fn_c_try_compile "$LINENO"; then :
++   ac_cv_sys_largefile_CC=' -n32'; break
++ fi
++ rm -f core conftest.err conftest.$ac_objext
++-         break
+++	 break
++        done
++        CC=$ac_save_CC
++        rm -f conftest.$ac_ext
++@@ -45168,8 +45188,8 @@ else
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -45192,8 +45212,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -45237,8 +45257,8 @@ else
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -45261,8 +45281,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++     incorrectly reject 9223372036854775807.  */
++ #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
++   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
++-                       && LARGE_OFF_T % 2147483647 == 1)
++-                      ? 1 : -1];
+++		       && LARGE_OFF_T % 2147483647 == 1)
+++		      ? 1 : -1];
++ int
++ main ()
++ {
++@@ -45773,7 +45793,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_FEBOOTSTRAP="febootstrap"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -45849,7 +45869,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_RPCGEN="rpcgen"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -45990,6 +46010,7 @@ fi
 + 
 + 
 + 
 ++
 + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 + 	if test -n "$ac_tool_prefix"; then
 +   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- @@ -46116,6 +46117,7 @@ if test -n "$AUGEAS_CFLAGS"; then
++@@ -46010,7 +46031,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46053,7 +46074,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46118,6 +46139,7 @@ if test -n "$AUGEAS_CFLAGS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_AUGEAS_CFLAGS=`$PKG_CONFIG --cflags "augeas" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -46132,6 +46134,7 @@ if test -n "$AUGEAS_LIBS"; then
++@@ -46134,6 +46156,7 @@ if test -n "$AUGEAS_LIBS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_AUGEAS_LIBS=`$PKG_CONFIG --libs "augeas" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -46151,9 +46154,9 @@ else
++@@ -46153,9 +46176,9 @@ else
 +         _pkg_short_errors_supported=no
 + fi
 +         if test $_pkg_short_errors_supported = yes; then
 +-	        AUGEAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "augeas" 2>&1`
 ++	        AUGEAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "augeas" 2>&1`
 +         else
 +-	        AUGEAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "augeas" 2>&1`
 ++	        AUGEAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "augeas" 2>&1`
 +         fi
 + 	# Put the nasty error message in config.log where it belongs
 + 	echo "$AUGEAS_PKG_ERRORS" >&5
- @@ -49077,6 +49080,7 @@ if test -n "$PCRE_CFLAGS"; then
++@@ -46306,7 +46329,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_CPIO="cpio"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46347,7 +46370,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_GPERF="gperf"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46388,7 +46411,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_POD2MAN="pod2man"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46428,7 +46451,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_POD2TEXT="pod2text"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46468,7 +46491,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_POD2HTML="pod2html"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46539,7 +46562,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_GENISOIMAGE="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46583,7 +46606,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_XMLLINT="xmllint"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46630,7 +46653,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_PO4A="po4a"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46679,7 +46702,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_DB_DUMP="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46722,7 +46745,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_DB_LOAD="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46780,7 +46803,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_PBMTEXT="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46823,7 +46846,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_PNMTOPNG="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46866,7 +46889,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_BMPTOPNM="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46909,7 +46932,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_PAMCUT="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -46981,7 +47004,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_WRESTOOL="$ac_prog"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -47043,7 +47066,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_QEMU="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -47378,7 +47401,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -49079,6 +49102,7 @@ if test -n "$PCRE_CFLAGS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_PCRE_CFLAGS=`$PKG_CONFIG --cflags "libpcre" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49093,6 +49097,7 @@ if test -n "$PCRE_LIBS"; then
++@@ -49095,6 +49119,7 @@ if test -n "$PCRE_LIBS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_PCRE_LIBS=`$PKG_CONFIG --libs "libpcre" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49112,9 +49117,9 @@ else
++@@ -49114,9 +49139,9 @@ else
 +         _pkg_short_errors_supported=no
 + fi
 +         if test $_pkg_short_errors_supported = yes; then
 +-	        PCRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libpcre" 2>&1`
 ++	        PCRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre" 2>&1`
 +         else
 +-	        PCRE_PKG_ERRORS=`$PKG_CONFIG --print-errors "libpcre" 2>&1`
 ++	        PCRE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre" 2>&1`
 +         fi
 + 	# Put the nasty error message in config.log where it belongs
 + 	echo "$PCRE_PKG_ERRORS" >&5
- @@ -49129,7 +49134,6 @@ installed software in a non-standard prefix.
++@@ -49131,7 +49156,6 @@ installed software in a non-standard prefix.
 + Alternatively, you may set the environment variables PCRE_CFLAGS
 + and PCRE_LIBS to avoid the need to call pkg-config.
 + See the pkg-config man page for more details." "$LINENO" 5
 +-
 + elif test $pkg_failed = untried; then
 +      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 + $as_echo "no" >&6; }
- @@ -49145,7 +49149,6 @@ See the pkg-config man page for more details.
++@@ -49147,7 +49171,6 @@ See the pkg-config man page for more details.
 + 
 + To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 + See \`config.log' for more details" "$LINENO" 5; }
 +-
 + else
 + 	PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS
 + 	PCRE_LIBS=$pkg_cv_PCRE_LIBS
- @@ -49224,6 +49227,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
++@@ -49226,6 +49249,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49240,6 +49244,7 @@ if test -n "$LIBVIRT_LIBS"; then
++@@ -49242,6 +49266,7 @@ if test -n "$LIBVIRT_LIBS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49259,9 +49264,9 @@ else
++@@ -49261,9 +49286,9 @@ else
 +         _pkg_short_errors_supported=no
 + fi
 +         if test $_pkg_short_errors_supported = yes; then
 +-	        LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libvirt" 2>&1`
 ++	        LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvirt" 2>&1`
 +         else
 +-	        LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libvirt" 2>&1`
 ++	        LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvirt" 2>&1`
 +         fi
 + 	# Put the nasty error message in config.log where it belongs
 + 	echo "$LIBVIRT_PKG_ERRORS" >&5
- @@ -49309,6 +49314,7 @@ if test -n "$LIBXML2_CFLAGS"; then
++@@ -49311,6 +49336,7 @@ if test -n "$LIBXML2_CFLAGS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49325,6 +49331,7 @@ if test -n "$LIBXML2_LIBS"; then
++@@ -49327,6 +49353,7 @@ if test -n "$LIBXML2_LIBS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49344,9 +49351,9 @@ else
++@@ -49346,9 +49373,9 @@ else
 +         _pkg_short_errors_supported=no
 + fi
 +         if test $_pkg_short_errors_supported = yes; then
 +-	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0" 2>&1`
 ++	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
 +         else
 +-	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0" 2>&1`
 ++	        LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
 +         fi
 + 	# Put the nasty error message in config.log where it belongs
 + 	echo "$LIBXML2_PKG_ERRORS" >&5
- @@ -49394,6 +49401,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
++@@ -49396,6 +49423,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_LIBCONFIG_CFLAGS=`$PKG_CONFIG --cflags "libconfig" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49410,6 +49418,7 @@ if test -n "$LIBCONFIG_LIBS"; then
++@@ -49412,6 +49440,7 @@ if test -n "$LIBCONFIG_LIBS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_LIBCONFIG_LIBS=`$PKG_CONFIG --libs "libconfig" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49429,9 +49438,9 @@ else
++@@ -49431,9 +49460,9 @@ else
 +         _pkg_short_errors_supported=no
 + fi
 +         if test $_pkg_short_errors_supported = yes; then
 +-	        LIBCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libconfig" 2>&1`
 ++	        LIBCONFIG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libconfig" 2>&1`
 +         else
 +-	        LIBCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libconfig" 2>&1`
 ++	        LIBCONFIG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libconfig" 2>&1`
 +         fi
 + 	# Put the nasty error message in config.log where it belongs
 + 	echo "$LIBCONFIG_PKG_ERRORS" >&5
- @@ -49479,6 +49488,7 @@ if test -n "$HIVEX_CFLAGS"; then
++@@ -49481,6 +49510,7 @@ if test -n "$HIVEX_CFLAGS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_HIVEX_CFLAGS=`$PKG_CONFIG --cflags "hivex" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49495,6 +49505,7 @@ if test -n "$HIVEX_LIBS"; then
++@@ -49497,6 +49527,7 @@ if test -n "$HIVEX_LIBS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_HIVEX_LIBS=`$PKG_CONFIG --libs "hivex" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49514,9 +49525,9 @@ else
++@@ -49516,9 +49547,9 @@ else
 +         _pkg_short_errors_supported=no
 + fi
 +         if test $_pkg_short_errors_supported = yes; then
 +-	        HIVEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "hivex" 2>&1`
 ++	        HIVEX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "hivex" 2>&1`
 +         else
 +-	        HIVEX_PKG_ERRORS=`$PKG_CONFIG --print-errors "hivex" 2>&1`
 ++	        HIVEX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "hivex" 2>&1`
 +         fi
 + 	# Put the nasty error message in config.log where it belongs
 + 	echo "$HIVEX_PKG_ERRORS" >&5
- @@ -49572,6 +49583,7 @@ if test -n "$FUSE_CFLAGS"; then
++@@ -49574,6 +49605,7 @@ if test -n "$FUSE_CFLAGS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_FUSE_CFLAGS=`$PKG_CONFIG --cflags "fuse" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49588,6 +49600,7 @@ if test -n "$FUSE_LIBS"; then
++@@ -49590,6 +49622,7 @@ if test -n "$FUSE_LIBS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_FUSE_LIBS=`$PKG_CONFIG --libs "fuse" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -49607,9 +49620,9 @@ else
++@@ -49609,9 +49642,9 @@ else
 +         _pkg_short_errors_supported=no
 + fi
 +         if test $_pkg_short_errors_supported = yes; then
 +-	        FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fuse" 2>&1`
 ++	        FUSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fuse" 2>&1`
 +         else
 +-	        FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors "fuse" 2>&1`
 ++	        FUSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fuse" 2>&1`
 +         fi
 + 	# Put the nasty error message in config.log where it belongs
 + 	echo "$FUSE_PKG_ERRORS" >&5
- @@ -52061,6 +52074,7 @@ if test -n "$GOBJECT_CFLAGS"; then
++@@ -49660,7 +49693,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_VALGRIND="valgrind"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -49729,7 +49762,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLC="${ac_tool_prefix}ocamlc"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -49769,7 +49802,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLC="ocamlc"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -49834,7 +49867,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLOPT="${ac_tool_prefix}ocamlopt"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -49874,7 +49907,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLOPT="ocamlopt"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -49944,7 +49977,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLCDOTOPT="${ac_tool_prefix}ocamlc.opt"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -49984,7 +50017,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLCDOTOPT="ocamlc.opt"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50048,7 +50081,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLOPTDOTOPT="${ac_tool_prefix}ocamlopt.opt"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50088,7 +50121,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLOPTDOTOPT="ocamlopt.opt"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50157,7 +50190,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLDEP="${ac_tool_prefix}ocamldep"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50197,7 +50230,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLDEP="ocamldep"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50251,7 +50284,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLMKTOP="${ac_tool_prefix}ocamlmktop"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50291,7 +50324,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLMKTOP="ocamlmktop"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50345,7 +50378,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLMKLIB="${ac_tool_prefix}ocamlmklib"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50385,7 +50418,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLMKLIB="ocamlmklib"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50439,7 +50472,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLDOC="${ac_tool_prefix}ocamldoc"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50479,7 +50512,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLDOC="ocamldoc"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50533,7 +50566,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLBUILD="${ac_tool_prefix}ocamlbuild"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50573,7 +50606,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLBUILD="ocamlbuild"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50628,7 +50661,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_OCAMLFIND="${ac_tool_prefix}ocamlfind"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50668,7 +50701,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_ac_ct_OCAMLFIND="ocamlfind"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50751,7 +50784,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_PERL="perl"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -50832,7 +50865,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_PYTHON="python"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51035,7 +51068,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_RUBY="ruby"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51073,7 +51106,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_RAKE="rake"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51343,7 +51376,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_GHC="ghc"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51403,7 +51436,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_PHP="php"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51441,7 +51474,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_PHPIZE="phpize"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51510,7 +51543,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_ERLC="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51553,7 +51586,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_ac_pt_ERLC="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51618,7 +51651,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_ERL="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51661,7 +51694,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_ac_pt_ERL="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51806,7 +51839,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_ERLC="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51849,7 +51882,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_ac_pt_ERLC="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51916,7 +51949,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_ERL="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -51959,7 +51992,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_path_ac_pt_ERL="$as_dir/$ac_word$ac_exec_ext"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -52118,6 +52151,7 @@ if test -n "$GOBJECT_CFLAGS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= 2.26.0" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -52077,6 +52091,7 @@ if test -n "$GOBJECT_LIBS"; then
++@@ -52134,6 +52168,7 @@ if test -n "$GOBJECT_LIBS"; then
 +   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +   test $ac_status = 0; }; then
 +   pkg_cv_GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= 2.26.0" 2>/dev/null`
 ++		      test "x$?" != "x0" && pkg_failed=yes
 + else
 +   pkg_failed=yes
 + fi
- @@ -52096,9 +52111,9 @@ else
++@@ -52153,9 +52188,9 @@ else
 +         _pkg_short_errors_supported=no
 + fi
 +         if test $_pkg_short_errors_supported = yes; then
 +-	        GOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= 2.26.0" 2>&1`
 ++	        GOBJECT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 >= 2.26.0" 2>&1`
 +         else
 +-	        GOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= 2.26.0" 2>&1`
 ++	        GOBJECT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 >= 2.26.0" 2>&1`
 +         fi
 + 	# Put the nasty error message in config.log where it belongs
 + 	echo "$GOBJECT_PKG_ERRORS" >&5
- @@ -52300,7 +52315,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
++@@ -52210,7 +52245,7 @@ do
++   IFS=$as_save_IFS
++   test -z "$as_dir" && as_dir=.
++     for ac_exec_ext in '' $ac_executable_extensions; do
++-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++     ac_cv_prog_GJS="gjs"
++     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++     break 2
++@@ -52357,7 +52392,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
 + 
 + ac_config_files="$ac_config_files run"
 + 
- -ac_config_files="$ac_config_files Makefile align/Makefile appliance/Makefile cat/Makefile clone/Makefile csharp/Makefile daemon/Makefile debian/changelog df/Makefile edit/Makefile erlang/Makefile erlang/examples/Makefile examples/Makefile fish/Makefile format/Makefile fuse/Makefile generator/Makefile gnulib/lib/Makefile gnulib/tests/Makefile gobject/Makefile haskell/Makefile inspector/Makefile java/Makefile java/examples/Makefile libguestfs.pc ocaml/META ocaml/Makefile ocaml/examples/Makefile perl/Makefile perl/Makefile.PL perl/examples/Makefile php/Makefile po-docs/Makefile po-docs/ja/Makefile po-docs/uk/Makefile po/Makefile.in python/Makefile python/examples/Makefile rescue/Makefile resize/Makefile ruby/Makefile ruby/Rakefile ruby/examples/Makefile sparsify/Makefile src/Makefile test-tool/Makefile tests/c-api/Makefile tests/data/Makefile tests/extra/Makefile tests/guests/Makefile tests/luks/Makefile tests/lvm/Makefile tests/md/Makefile tests/protocol/Makefile tests/qemu/Makefile tests/regressions/Makefile tools/Makefile"
- +ac_config_files="$ac_config_files Makefile align/Makefile appliance/Makefile cat/Makefile clone/Makefile csharp/Makefile daemon/Makefile df/Makefile edit/Makefile erlang/Makefile erlang/examples/Makefile examples/Makefile fish/Makefile format/Makefile fuse/Makefile generator/Makefile gnulib/lib/Makefile gnulib/tests/Makefile gobject/Makefile haskell/Makefile inspector/Makefile java/Makefile java/examples/Makefile libguestfs.pc ocaml/META ocaml/Makefile ocaml/examples/Makefile perl/Makefile perl/Makefile.PL perl/examples/Makefile php/Makefile po-docs/Makefile po-docs/ja/Makefile po-docs/uk/Makefile po/Makefile.in python/Makefile python/examples/Makefile rescue/Makefile resize/Makefile ruby/Makefile ruby/Rakefile ruby/examples/Makefile sparsify/Makefile src/Makefile test-tool/Makefile tests/c-api/Makefile tests/data/Makefile tests/extra/Makefile tests/guests/Makefile tests/luks/Makefile tests/lvm/Makefile tests/md/Makefile tests/protocol/Makefile tests/qemu/Makefile tests/regressions/Makefile tools/Makefile"
++-ac_config_files="$ac_config_files Makefile align/Makefile appliance/Makefile cat/Makefile clone/Makefile csharp/Makefile daemon/Makefile debian/changelog df/Makefile edit/Makefile erlang/Makefile erlang/examples/Makefile examples/Makefile fish/Makefile format/Makefile fuse/Makefile generator/Makefile gnulib/lib/Makefile gnulib/tests/Makefile gobject/Makefile haskell/Makefile inspector/Makefile java/Makefile java/examples/Makefile ocaml/META ocaml/Makefile ocaml/examples/Makefile perl/Makefile perl/Makefile.PL perl/examples/Makefile php/Makefile po-docs/Makefile po-docs/ja/Makefile po-docs/uk/Makefile po/Makefile.in python/Makefile python/examples/Makefile rescue/Makefile resize/Makefile ruby/Makefile ruby/Rakefile ruby/examples/Makefile sparsify/Makefile src/Makefile src/libguestfs.pc test-tool/Makefile tests/c-api/Makefile tests/data/Makefile tests/extra/Makefile tests/guests/Makefile tests/luks/Makefile tests/lvm/Makefile tests/md/Makefile tests/protocol/Makefile tests/qemu/Makefile tests/regressions/Makefile tools/Makefile"
+++ac_config_files="$ac_config_files Makefile align/Makefile appliance/Makefile cat/Makefile clone/Makefile csharp/Makefile daemon/Makefile df/Makefile edit/Makefile erlang/Makefile erlang/examples/Makefile examples/Makefile fish/Makefile format/Makefile fuse/Makefile generator/Makefile gnulib/lib/Makefile gnulib/tests/Makefile gobject/Makefile haskell/Makefile inspector/Makefile java/Makefile java/examples/Makefile ocaml/META ocaml/Makefile ocaml/examples/Makefile perl/Makefile perl/Makefile.PL perl/examples/Makefile php/Makefile po-docs/Makefile po-docs/ja/Makefile po-docs/uk/Makefile po/Makefile.in python/Makefile python/examples/Makefile rescue/Makefile resize/Makefile ruby/Makefile ruby/Rakefile ruby/examples/Makefile sparsify/Makefile src/Makefile src/libguestfs.pc test-tool/Makefile tests/c-api/Makefile tests/data/Makefile tests/extra/Makefile tests/guests/Makefile tests/luks/Makefile tests/lvm/Makefile tests/md/Makefile tests/protocol/Makefile tests/qemu/Makefile tests/regressions/Makefile tools/Makefile"
 + 
 + cat >confcache <<\_ACEOF
 + # This file is a shell script that caches the results of configure
- @@ -53528,7 +53543,6 @@ do
++@@ -52975,16 +53010,16 @@ if (echo >conf$$.file) 2>/dev/null; then
++     # ... but there are two gotchas:
++     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++-    # In both cases, we have to default to `cp -p'.
+++    # In both cases, we have to default to `cp -pR'.
++     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++-      as_ln_s='cp -p'
+++      as_ln_s='cp -pR'
++   elif ln conf$$.file conf$$ 2>/dev/null; then
++     as_ln_s=ln
++   else
++-    as_ln_s='cp -p'
+++    as_ln_s='cp -pR'
++   fi
++ else
++-  as_ln_s='cp -p'
+++  as_ln_s='cp -pR'
++ fi
++ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++ rmdir conf$$.dir 2>/dev/null
++@@ -53044,28 +53079,16 @@ else
++   as_mkdir_p=false
++ fi
++ 
++-if test -x / >/dev/null 2>&1; then
++-  as_test_x='test -x'
++-else
++-  if ls -dL / >/dev/null 2>&1; then
++-    as_ls_L_option=L
++-  else
++-    as_ls_L_option=
++-  fi
++-  as_test_x='
++-    eval sh -c '\''
++-      if test -d "$1"; then
++-	test -d "$1/.";
++-      else
++-	case $1 in #(
++-	-*)set "./$1";;
++-	esac;
++-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
++-	???[sx]*):;;*)false;;esac;fi
++-    '\'' sh
++-  '
++-fi
++-as_executable_p=$as_test_x
+++
+++# as_fn_executable_p FILE
+++# -----------------------
+++# Test if FILE is an executable regular file.
+++as_fn_executable_p ()
+++{
+++  test -f "$1" && test -x "$1"
+++} # as_fn_executable_p
+++as_test_x='test -x'
+++as_executable_p=as_fn_executable_p
++ 
++ # Sed expression to map a string onto a valid CPP name.
++ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++@@ -53087,7 +53110,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++ # values after options handling.
++ ac_log="
++ This file was extended by libguestfs $as_me 1.16.21, which was
++-generated by GNU Autoconf 2.68.  Invocation command line was
+++generated by GNU Autoconf 2.69.  Invocation command line was
++ 
++   CONFIG_FILES    = $CONFIG_FILES
++   CONFIG_HEADERS  = $CONFIG_HEADERS
++@@ -53157,10 +53180,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
++ ac_cs_version="\\
++ libguestfs config.status 1.16.21
++-configured by $0, generated by GNU Autoconf 2.68,
+++configured by $0, generated by GNU Autoconf 2.69,
++   with options \\"\$ac_cs_config\\"
++ 
++-Copyright (C) 2010 Free Software Foundation, Inc.
+++Copyright (C) 2012 Free Software Foundation, Inc.
++ This config.status script is free software; the Free Software Foundation
++ gives unlimited permission to copy, distribute and modify it."
++ 
++@@ -53251,7 +53274,7 @@ fi
++ _ACEOF
++ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ if \$ac_cs_recheck; then
++-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+++  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++   shift
++   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
++   CONFIG_SHELL='$SHELL'
++@@ -53585,7 +53608,6 @@ do
 +     "clone/Makefile") CONFIG_FILES="$CONFIG_FILES clone/Makefile" ;;
 +     "csharp/Makefile") CONFIG_FILES="$CONFIG_FILES csharp/Makefile" ;;
 +     "daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
 +-    "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
 +     "df/Makefile") CONFIG_FILES="$CONFIG_FILES df/Makefile" ;;
 +     "edit/Makefile") CONFIG_FILES="$CONFIG_FILES edit/Makefile" ;;
 +     "erlang/Makefile") CONFIG_FILES="$CONFIG_FILES erlang/Makefile" ;;
 +diff --git a/csharp/Makefile.in b/csharp/Makefile.in
- index 376acc2..8b2dc60 100644
++index 7219433..e4869fa 100644
 +--- a/csharp/Makefile.in
 ++++ b/csharp/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -110,24 +127,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -194,6 +211,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 + pkglibexecdir = @pkglibexecdir@
 + ACLOCAL = @ACLOCAL@
 +diff --git a/daemon/Makefile.in b/daemon/Makefile.in
- index b627aa1..15496e8 100644
++index 238c837..023a0ae 100644
 +--- a/daemon/Makefile.in
 ++++ b/daemon/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -114,24 +131,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -290,6 +307,11 @@ SOURCES = $(liberrnostring_a_SOURCES) $(libprotocol_a_SOURCES) \
 + 	$(guestfsd_SOURCES)
 + DIST_SOURCES = $(liberrnostring_a_SOURCES) $(libprotocol_a_SOURCES) \
 + 	$(guestfsd_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + ETAGS = etags
 + CTAGS = ctags
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- @@ -1505,8 +1527,11 @@ clean-noinstPROGRAMS:
++@@ -1507,8 +1529,11 @@ clean-noinstPROGRAMS:
 + 	rm -f $$list
 + install-sbinPROGRAMS: $(sbin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
 + 	@list='$(sbin_PROGRAMS)'; test -n "$(sbindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(sbindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(sbindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -3017,10 +3042,10 @@ $(top_builddir)/daemon/guestfsd: force
++@@ -3019,10 +3044,10 @@ $(top_builddir)/daemon/guestfsd: force
 + appliance: force
 + 	$(MAKE) -C $(top_builddir)/appliance
 + 
 +-guestfs_protocol.c: $(libsrcdir)/guestfs_protocol.c
 ++guestfs_protocol.c: $(srcdir)/guestfs_protocol.c
 + 	rm -f $@
 + 	ln $< $@
 +-guestfs_protocol.h: $(libsrcdir)/guestfs_protocol.h
 ++guestfs_protocol.h: $(srcdir)/guestfs_protocol.h
 + 	rm -f $@
 + 	ln $< $@
 + $(libsrcdir)/guestfs_protocol.c: force
 +diff --git a/df/Makefile.in b/df/Makefile.in
- index cd25f21..9833fdb 100644
++index 9aba2d0..17f8941 100644
 +--- a/df/Makefile.in
 ++++ b/df/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -236,6 +253,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(virt_df_SOURCES)
 + DIST_SOURCES = $(virt_df_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1385,8 +1407,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1387,8 +1409,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1600,11 +1625,18 @@ clean-libtool:
++@@ -1602,11 +1627,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/edit/Makefile.in b/edit/Makefile.in
- index 8c3fc91..d4089e6 100644
++index 1a896d3..c1a62c9 100644
 +--- a/edit/Makefile.in
 ++++ b/edit/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -233,6 +250,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(virt_edit_SOURCES)
 + DIST_SOURCES = $(virt_edit_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1374,8 +1396,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1376,8 +1398,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1544,11 +1569,18 @@ clean-libtool:
++@@ -1546,11 +1571,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/erlang/Makefile.in b/erlang/Makefile.in
- index 65d42ef..68b28a2 100644
++index 2899a70..8bc640c 100644
 +--- a/erlang/Makefile.in
 ++++ b/erlang/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -234,6 +251,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(erl_guestfs_SOURCES)
 + DIST_SOURCES = $(am__erl_guestfs_SOURCES_DIST)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1351,8 +1373,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1353,8 +1375,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1461,8 +1486,11 @@ clean-libtool:
++@@ -1463,8 +1488,11 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-erlang_binDATA: $(erlang_bin_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(erlang_bindir)" || $(MKDIR_P) "$(DESTDIR)$(erlang_bindir)"
 + 	@list='$(erlang_bin_DATA)'; test -n "$(erlang_bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(erlang_bindir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(erlang_bindir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(erlang_bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
 +diff --git a/erlang/examples/Makefile.in b/erlang/examples/Makefile.in
- index bf39dc3..7483bc3 100644
++index 0c62b1d..8bed53d 100644
 +--- a/erlang/examples/Makefile.in
 ++++ b/erlang/examples/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -33,6 +33,23 @@
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -93,24 +110,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -177,6 +194,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1285,11 +1307,18 @@ clean-libtool:
++@@ -1287,11 +1309,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man3: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
 +-	@list=''; test -n "$(man3dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.3[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man3dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.3[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/examples/Makefile.in b/examples/Makefile.in
- index 40562dd..181c1c7 100644
++index 7cde299..bc3a959 100644
 +--- a/examples/Makefile.in
 ++++ b/examples/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -34,6 +34,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -97,24 +114,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -230,6 +247,11 @@ SOURCES = $(create_disk_SOURCES) $(inspect_vm_SOURCES) \
 + 	$(virt_dhcp_address_SOURCES)
 + DIST_SOURCES = $(create_disk_SOURCES) $(inspect_vm_SOURCES) \
 + 	$(virt_dhcp_address_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1474,11 +1496,18 @@ clean-libtool:
++@@ -1476,11 +1498,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
- @@ -1510,11 +1539,18 @@ uninstall-man1:
++@@ -1512,11 +1541,18 @@ uninstall-man1:
 + 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 + install-man3: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
 +-	@list=''; test -n "$(man3dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.3[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man3dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.3[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/fish/Makefile.in b/fish/Makefile.in
- index 0c774ab..33d1f5b 100644
++index 3e6a2f4..b3af28c 100644
 +--- a/fish/Makefile.in
 ++++ b/fish/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -53,6 +53,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -125,24 +142,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -308,6 +325,11 @@ SOURCES = $(libcmds_la_SOURCES) $(librc_protocol_la_SOURCES) \
 + 	$(guestfish_SOURCES)
 + DIST_SOURCES = $(libcmds_la_SOURCES) $(librc_protocol_la_SOURCES) \
 + 	$(guestfish_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + man1dir = $(mandir)/man1
 + NROFF = nroff
 + MANS = $(man_MANS)
- @@ -1533,8 +1555,11 @@ librc_protocol.la: $(librc_protocol_la_OBJECTS) $(librc_protocol_la_DEPENDENCIES
++@@ -1535,8 +1557,11 @@ librc_protocol.la: $(librc_protocol_la_OBJECTS) $(librc_protocol_la_DEPENDENCIES
 + 	$(AM_V_CCLD)$(librc_protocol_la_LINK)  $(librc_protocol_la_OBJECTS) $(librc_protocol_la_LIBADD) $(LIBS)
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1579,8 +1604,11 @@ guestfish$(EXEEXT): $(guestfish_OBJECTS) $(guestfish_DEPENDENCIES) $(EXTRA_guest
++@@ -1581,8 +1606,11 @@ guestfish$(EXEEXT): $(guestfish_OBJECTS) $(guestfish_DEPENDENCIES) $(EXTRA_guest
 + 	$(AM_V_CCLD)$(guestfish_LINK) $(guestfish_OBJECTS) $(guestfish_LDADD) $(LIBS)
 + install-binSCRIPTS: $(bin_SCRIPTS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- @@ -2201,11 +2229,18 @@ clean-libtool:
++@@ -2203,11 +2231,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
- @@ -2237,8 +2272,11 @@ uninstall-man1:
++@@ -2239,8 +2274,11 @@ uninstall-man1:
 + 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 + install-bashcompletionDATA: $(bashcompletion_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bashcompletiondir)" || $(MKDIR_P) "$(DESTDIR)$(bashcompletiondir)"
 + 	@list='$(bashcompletion_DATA)'; test -n "$(bashcompletiondir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bashcompletiondir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(bashcompletiondir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(bashcompletiondir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
- @@ -2255,8 +2293,11 @@ uninstall-bashcompletionDATA:
++@@ -2257,8 +2295,11 @@ uninstall-bashcompletionDATA:
 + 	dir='$(DESTDIR)$(bashcompletiondir)'; $(am__uninstall_files_from_dir)
 + install-toolsconfDATA: $(toolsconf_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(toolsconfdir)" || $(MKDIR_P) "$(DESTDIR)$(toolsconfdir)"
 + 	@list='$(toolsconf_DATA)'; test -n "$(toolsconfdir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(toolsconfdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(toolsconfdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(toolsconfdir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
 +diff --git a/format/Makefile.in b/format/Makefile.in
- index 655893c..caeaa62 100644
++index f90f5b1..792da7b 100644
 +--- a/format/Makefile.in
 ++++ b/format/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -234,6 +251,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(virt_format_SOURCES)
 + DIST_SOURCES = $(virt_format_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1374,8 +1396,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1376,8 +1398,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1544,11 +1569,18 @@ clean-libtool:
++@@ -1546,11 +1571,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/fuse/Makefile.in b/fuse/Makefile.in
- index 2b6fc5d..8e88ce5 100644
++index 94d74df..6f67460 100644
 +--- a/fuse/Makefile.in
 ++++ b/fuse/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -242,6 +259,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(guestmount_SOURCES)
 + DIST_SOURCES = $(am__guestmount_SOURCES_DIST)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1386,8 +1408,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1388,8 +1410,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1571,11 +1596,18 @@ clean-libtool:
++@@ -1573,11 +1598,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/generator/Makefile.in b/generator/Makefile.in
- index 0751e9e..db8517b 100644
++index 3668fd0..87c6930 100644
 +--- a/generator/Makefile.in
 ++++ b/generator/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -33,6 +33,23 @@
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -93,24 +110,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -176,6 +193,11 @@ AM_V_at = $(am__v_at_ at AM_V@)
 + am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DATA = $(noinst_DATA)
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 + pkglibexecdir = @pkglibexecdir@
 +diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
- index e7ae33f..4937340 100644
++index 2fd0f02..32cfbf4 100644
 +--- a/gnulib/lib/Makefile.in
 ++++ b/gnulib/lib/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -41,6 +41,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -102,24 +119,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -237,6 +254,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 + 	install-pdf-recursive install-ps-recursive install-recursive \
 + 	installcheck-recursive installdirs-recursive pdf-recursive \
 + 	ps-recursive uninstall-recursive
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + HEADERS = $(noinst_HEADERS)
 + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
 +   distclean-recursive maintainer-clean-recursive
- @@ -1858,13 +1880,10 @@ distdir: $(DISTFILES)
++@@ -1860,13 +1882,10 @@ distdir: $(DISTFILES)
 + 	done
 + 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 + 	  if test "$$subdir" = .; then :; else \
 +-	    test -d "$(distdir)/$$subdir" \
 +-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 +-	    || exit 1; \
 +-	  fi; \
 +-	done
 +-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 +-	  if test "$$subdir" = .; then :; else \
 ++	    $(am__make_dryrun) \
 ++	      || test -d "$(distdir)/$$subdir" \
 ++	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 ++	      || exit 1; \
 + 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 + 	    $(am__relativize); \
 + 	    new_distdir=$$reldir; \
 +diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in
- index ec21a02..01ca8b7 100644
++index 385ff69..f5cf243 100644
 +--- a/gnulib/tests/Makefile.in
 ++++ b/gnulib/tests/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -40,6 +40,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -242,24 +259,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -1146,6 +1163,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 + 	install-pdf-recursive install-ps-recursive install-recursive \
 + 	installcheck-recursive installdirs-recursive pdf-recursive \
 + 	ps-recursive uninstall-recursive
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + HEADERS = $(noinst_HEADERS)
 + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
 +   distclean-recursive maintainer-clean-recursive
- @@ -3415,13 +3437,10 @@ distdir: $(DISTFILES)
++@@ -3417,13 +3439,10 @@ distdir: $(DISTFILES)
 + 	done
 + 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 + 	  if test "$$subdir" = .; then :; else \
 +-	    test -d "$(distdir)/$$subdir" \
 +-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 +-	    || exit 1; \
 +-	  fi; \
 +-	done
 +-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 +-	  if test "$$subdir" = .; then :; else \
 ++	    $(am__make_dryrun) \
 ++	      || test -d "$(distdir)/$$subdir" \
 ++	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 ++	      || exit 1; \
 + 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 + 	    $(am__relativize); \
 + 	    new_distdir=$$reldir; \
 +diff --git a/gobject/Makefile.in b/gobject/Makefile.in
- index 4df8dec..34e4261 100644
++index e4c5f89..07217d7 100644
 +--- a/gobject/Makefile.in
 ++++ b/gobject/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -35,6 +35,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -97,24 +114,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -244,6 +261,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(libguestfs_gobject_1_0_la_SOURCES)
 + DIST_SOURCES = $(libguestfs_gobject_1_0_la_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DATA = $(gir_DATA) $(typelib_DATA)
 + HEADERS = $(libguestfs_gobject_1_0_la_HEADERS)
 + ETAGS = etags
- @@ -1352,7 +1374,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1354,7 +1376,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 + 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 + 	list2=; for p in $$list; do \
 + 	  if test -f $$p; then \
- @@ -1360,6 +1381,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++@@ -1362,6 +1383,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 + 	  else :; fi; \
 + 	done; \
 + 	test -z "$$list2" || { \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(libdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 + 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 + 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 + 	}
- @@ -1427,8 +1450,11 @@ clean-libtool:
++@@ -1429,8 +1452,11 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-girDATA: $(gir_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)"
 + 	@list='$(gir_DATA)'; test -n "$(girdir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(girdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
- @@ -1445,8 +1471,11 @@ uninstall-girDATA:
++@@ -1447,8 +1473,11 @@ uninstall-girDATA:
 + 	dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir)
 + install-typelibDATA: $(typelib_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)"
 + 	@list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(typelibdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
- @@ -1463,8 +1492,11 @@ uninstall-typelibDATA:
++@@ -1465,8 +1494,11 @@ uninstall-typelibDATA:
 + 	dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir)
 + install-libguestfs_gobject_1_0_laHEADERS: $(libguestfs_gobject_1_0_la_HEADERS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(libguestfs_gobject_1_0_ladir)" || $(MKDIR_P) "$(DESTDIR)$(libguestfs_gobject_1_0_ladir)"
 + 	@list='$(libguestfs_gobject_1_0_la_HEADERS)'; test -n "$(libguestfs_gobject_1_0_ladir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(libguestfs_gobject_1_0_ladir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(libguestfs_gobject_1_0_ladir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(libguestfs_gobject_1_0_ladir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
 +diff --git a/haskell/Makefile.in b/haskell/Makefile.in
- index 25501d1..4b414a7 100644
++index 59cb71d..4a0a71c 100644
 +--- a/haskell/Makefile.in
 ++++ b/haskell/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -110,24 +127,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -194,6 +211,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__tty_colors = \
 + red=; grn=; lgn=; blu=; std=
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +diff --git a/inspector/Makefile.in b/inspector/Makefile.in
- index 9ad7fe8..743851d 100644
++index 5a18bba..1be94d1 100644
 +--- a/inspector/Makefile.in
 ++++ b/inspector/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -244,6 +261,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(virt_inspector_SOURCES)
 + DIST_SOURCES = $(am__virt_inspector_SOURCES_DIST)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1399,8 +1421,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1401,8 +1423,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1569,11 +1594,18 @@ clean-libtool:
++@@ -1571,11 +1596,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
- @@ -1605,8 +1637,11 @@ uninstall-man1:
++@@ -1607,8 +1639,11 @@ uninstall-man1:
 + 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 + install-dist_docDATA: $(dist_doc_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 + 	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(docdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
 +diff --git a/java/Makefile.in b/java/Makefile.in
- index 80702b8..efb9306 100644
++index 73f6374..1756e06 100644
 +--- a/java/Makefile.in
 ++++ b/java/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -73,6 +73,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -135,24 +152,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -285,6 +302,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(libguestfs_jni_la_SOURCES)
 + DIST_SOURCES = $(am__libguestfs_jni_la_SOURCES_DIST)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DATA = $(libguestfs_jar_DATA) $(noinst_DATA)
 + ETAGS = etags
 + CTAGS = ctags
- @@ -1430,7 +1452,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1432,7 +1454,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-jnilibLTLIBRARIES: $(jnilib_LTLIBRARIES)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(jnilibdir)" || $(MKDIR_P) "$(DESTDIR)$(jnilibdir)"
 + 	@list='$(jnilib_LTLIBRARIES)'; test -n "$(jnilibdir)" || list=; \
 + 	list2=; for p in $$list; do \
 + 	  if test -f $$p; then \
- @@ -1438,6 +1459,8 @@ install-jnilibLTLIBRARIES: $(jnilib_LTLIBRARIES)
++@@ -1440,6 +1461,8 @@ install-jnilibLTLIBRARIES: $(jnilib_LTLIBRARIES)
 + 	  else :; fi; \
 + 	done; \
 + 	test -z "$$list2" || { \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(jnilibdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(jnilibdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(jnilibdir)" || exit 1; \
 + 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(jnilibdir)'"; \
 + 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(jnilibdir)"; \
 + 	}
- @@ -1505,8 +1528,11 @@ clean-libtool:
++@@ -1507,8 +1530,11 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-libguestfs_jarDATA: $(libguestfs_jar_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(libguestfs_jardir)" || $(MKDIR_P) "$(DESTDIR)$(libguestfs_jardir)"
 + 	@list='$(libguestfs_jar_DATA)'; test -n "$(libguestfs_jardir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(libguestfs_jardir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(libguestfs_jardir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(libguestfs_jardir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
 +diff --git a/java/examples/Makefile.in b/java/examples/Makefile.in
- index 0ea7769..263b695 100644
++index 59b55e9..7e358c6 100644
 +--- a/java/examples/Makefile.in
 ++++ b/java/examples/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -34,6 +34,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -94,24 +111,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -179,6 +196,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1291,11 +1313,18 @@ clean-libtool:
++@@ -1293,11 +1315,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man3: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
 +-	@list=''; test -n "$(man3dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.3[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man3dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.3[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
- index 8279123..0b65783 100644
++index 98d4d27..6b5082c 100644
 +--- a/ocaml/Makefile.in
 ++++ b/ocaml/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -119,24 +136,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -237,6 +254,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(libguestfsocaml_a_SOURCES)
 + DIST_SOURCES = $(am__libguestfsocaml_a_SOURCES_DIST)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DATA = $(noinst_DATA)
 + ETAGS = etags
 + CTAGS = ctags
 +diff --git a/ocaml/examples/Makefile.in b/ocaml/examples/Makefile.in
- index 422d5f4..d3e3680 100644
++index f1e56f2..df336bb 100644
 +--- a/ocaml/examples/Makefile.in
 ++++ b/ocaml/examples/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -34,6 +34,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -94,24 +111,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -179,6 +196,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1292,11 +1314,18 @@ clean-libtool:
++@@ -1294,11 +1316,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man3: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
 +-	@list=''; test -n "$(man3dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.3[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man3dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.3[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/perl/Makefile.in b/perl/Makefile.in
- index 2142830..51a449b 100644
++index 1bb6f69..d8e3539 100644
 +--- a/perl/Makefile.in
 ++++ b/perl/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -112,24 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -196,6 +213,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__tty_colors = \
 + red=; grn=; lgn=; blu=; std=
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- @@ -1576,6 +1598,7 @@ appliance: force
++@@ -1578,6 +1600,7 @@ appliance: force
 + @HAVE_PERL_TRUE@	$(MAKE) -f Makefile-pl
 + 
 + @HAVE_PERL_TRUE at Makefile-pl: Makefile.PL
 ++ at HAVE_PERL_TRUE@	-[ $(srcdir) != $(builddir) ] && cp -rsu $(abs_srcdir)/. $(builddir)/.
 + @HAVE_PERL_TRUE@	perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
 + 
 + # No!  Otherwise it is deleted before the clean-local rule runs.
 +diff --git a/perl/examples/Makefile.in b/perl/examples/Makefile.in
- index dfe67e0..1b67850 100644
++index 7f873ba..c5252f5 100644
 +--- a/perl/examples/Makefile.in
 ++++ b/perl/examples/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -33,6 +33,23 @@
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -93,24 +110,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -177,6 +194,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1285,11 +1307,18 @@ clean-libtool:
++@@ -1287,11 +1309,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man3: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
 +-	@list=''; test -n "$(man3dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.3[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man3dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.3[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/php/Makefile.in b/php/Makefile.in
- index 804b750..bd93ce4 100644
++index 0874fb7..e1cea47 100644
 +--- a/php/Makefile.in
 ++++ b/php/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -50,6 +50,23 @@
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -111,24 +128,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -195,6 +212,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1309,8 +1331,11 @@ clean-libtool:
++@@ -1311,8 +1333,11 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-phpDATA: $(php_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(phpdir)" || $(MKDIR_P) "$(DESTDIR)$(phpdir)"
 + 	@list='$(php_DATA)'; test -n "$(phpdir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(phpdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(phpdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(phpdir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
 +diff --git a/po-docs/Makefile.in b/po-docs/Makefile.in
- index 02c636c..cd81a1f 100644
++index e55397d..16b0a1c 100644
 +--- a/po-docs/Makefile.in
 ++++ b/po-docs/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -36,6 +36,23 @@
 + # into the po/ directory and the translations into the usual
 + # libguestfs.pot file.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -96,24 +113,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -187,6 +204,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 + 	install-pdf-recursive install-ps-recursive install-recursive \
 + 	installcheck-recursive installdirs-recursive pdf-recursive \
 + 	ps-recursive uninstall-recursive
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
 +   distclean-recursive maintainer-clean-recursive
 + AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- @@ -1468,13 +1490,10 @@ distdir: $(DISTFILES)
++@@ -1470,13 +1492,10 @@ distdir: $(DISTFILES)
 + 	done
 + 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 + 	  if test "$$subdir" = .; then :; else \
 +-	    test -d "$(distdir)/$$subdir" \
 +-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 +-	    || exit 1; \
 +-	  fi; \
 +-	done
 +-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 +-	  if test "$$subdir" = .; then :; else \
 ++	    $(am__make_dryrun) \
 ++	      || test -d "$(distdir)/$$subdir" \
 ++	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 ++	      || exit 1; \
 + 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 + 	    $(am__relativize); \
 + 	    new_distdir=$$reldir; \
 +diff --git a/po-docs/ja/Makefile.in b/po-docs/ja/Makefile.in
- index a001933..f7c8978 100644
++index de078ac..6648092 100644
 +--- a/po-docs/ja/Makefile.in
 ++++ b/po-docs/ja/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -36,6 +36,23 @@
 + # identical.  If you create a new $lang.po, create the $lang/
 + # subdirectory and copy the Makefile.am from an existing language.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -96,24 +113,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -180,6 +197,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 + pkglibexecdir = @pkglibexecdir@
 + ACLOCAL = @ACLOCAL@
 +diff --git a/po-docs/uk/Makefile.in b/po-docs/uk/Makefile.in
- index ca4720e..d0ed596 100644
++index 60ed4c2..e419ace 100644
 +--- a/po-docs/uk/Makefile.in
 ++++ b/po-docs/uk/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -36,6 +36,23 @@
 + # identical.  If you create a new $lang.po, create the $lang/
 + # subdirectory and copy the Makefile.am from an existing language.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -96,24 +113,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -180,6 +197,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 + pkglibexecdir = @pkglibexecdir@
 + ACLOCAL = @ACLOCAL@
 +diff --git a/po/POTFILES.in b/po/POTFILES.in
 +index 3a43d17..aff8e8d 100644
 +--- a/po/POTFILES.in
 ++++ b/po/POTFILES.in
 +@@ -133,7 +133,6 @@ inspector/virt-inspector.c
 + java/com_redhat_et_libguestfs_GuestFS.c
 + ocaml/guestfs_c.c
 + ocaml/guestfs_c_actions.c
 +-perl/Guestfs.c
 + perl/bindtests.pl
 + perl/lib/Sys/Guestfs.pm
 + perl/lib/Sys/Guestfs/Lib.pm
 +@@ -166,8 +165,3 @@ src/match.c
 + src/proto.c
 + src/virt.c
 + test-tool/test-tool.c
 +-tools/virt-list-filesystems.pl
 +-tools/virt-list-partitions.pl
 +-tools/virt-make-fs.pl
 +-tools/virt-tar.pl
 +-tools/virt-win-reg.pl
 +diff --git a/python/Makefile.in b/python/Makefile.in
- index fd447b9..3833b95 100644
++index 612e87d..5f5f9bb 100644
 +--- a/python/Makefile.in
 ++++ b/python/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -262,6 +279,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(libguestfsmod_la_SOURCES)
 + DIST_SOURCES = $(am__libguestfsmod_la_SOURCES_DIST)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DATA = $(python_DATA)
 + ETAGS = etags
 + CTAGS = ctags
 +@@ -1357,7 +1379,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-pythonLTLIBRARIES: $(python_LTLIBRARIES)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)"
 + 	@list='$(python_LTLIBRARIES)'; test -n "$(pythondir)" || list=; \
 + 	list2=; for p in $$list; do \
 + 	  if test -f $$p; then \
 +@@ -1365,6 +1386,8 @@ install-pythonLTLIBRARIES: $(python_LTLIBRARIES)
 + 	  else :; fi; \
 + 	done; \
 + 	test -z "$$list2" || { \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(pythondir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(pythondir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(pythondir)" || exit 1; \
 + 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pythondir)'"; \
 + 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pythondir)"; \
 + 	}
 +@@ -1440,8 +1463,11 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-pythonDATA: $(python_DATA)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(pythondir)" || $(MKDIR_P) "$(DESTDIR)$(pythondir)"
 + 	@list='$(python_DATA)'; test -n "$(pythondir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(pythondir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(pythondir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(pythondir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
 +diff --git a/python/examples/Makefile.in b/python/examples/Makefile.in
- index e426578..9fc10be 100644
++index dae89cc..9f74dec 100644
 +--- a/python/examples/Makefile.in
 ++++ b/python/examples/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -33,6 +33,23 @@
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -93,24 +110,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -177,6 +194,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1285,11 +1307,18 @@ clean-libtool:
++@@ -1287,11 +1309,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man3: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
 +-	@list=''; test -n "$(man3dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.3[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man3dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.3[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/rescue/Makefile.in b/rescue/Makefile.in
- index 5eae29b..6bf50e1 100644
++index abe2098..8afc3c5 100644
 +--- a/rescue/Makefile.in
 ++++ b/rescue/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -234,6 +251,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(virt_rescue_SOURCES)
 + DIST_SOURCES = $(virt_rescue_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1364,8 +1386,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1366,8 +1388,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1534,11 +1559,18 @@ clean-libtool:
++@@ -1536,11 +1561,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/resize/Makefile.in b/resize/Makefile.in
- index 703595f..6d95697 100644
++index 30ac51a..88c81dd 100644
 +--- a/resize/Makefile.in
 ++++ b/resize/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -114,24 +131,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -226,6 +243,11 @@ AM_V_at = $(am__v_at_ at AM_V@)
 + am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + man1dir = $(mandir)/man1
 + NROFF = nroff
 + MANS = $(man_MANS)
- @@ -1346,8 +1368,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1348,8 +1370,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binSCRIPTS: $(bin_SCRIPTS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- @@ -1384,11 +1409,18 @@ clean-libtool:
++@@ -1386,11 +1411,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/ruby/Makefile.in b/ruby/Makefile.in
- index 411581d..5211f10 100644
++index 7d8d3c4..e7d3df9 100644
 +--- a/ruby/Makefile.in
 ++++ b/ruby/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -110,24 +127,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -194,6 +211,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__tty_colors = \
 + red=; grn=; lgn=; blu=; std=
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- @@ -1252,8 +1274,8 @@ CLEANFILES = \
++@@ -1254,8 +1276,8 @@ CLEANFILES = \
 + @HAVE_RUBY_TRUE@	RUBY=$(RUBY) \
 + @HAVE_RUBY_TRUE@	$(top_builddir)/run
 + 
 +- at HAVE_RUBY_TRUE@RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
 +- at HAVE_RUBY_TRUE@RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
 ++ at HAVE_RUBY_TRUE@RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
 ++ at HAVE_RUBY_TRUE@RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
 + all: all-am
 + 
 + .SUFFIXES:
- @@ -1570,10 +1592,10 @@ appliance: force
++@@ -1572,10 +1594,10 @@ appliance: force
 + @HAVE_RUBY_TRUE@	$(RAKE) rdoc
 + 
 + @HAVE_RUBY_TRUE at install:
 +- at HAVE_RUBY_TRUE@	$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
 +- at HAVE_RUBY_TRUE@	$(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
 +- at HAVE_RUBY_TRUE@	$(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB)
 +- at HAVE_RUBY_TRUE@	$(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH)
 ++ at HAVE_RUBY_TRUE@	$(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
 ++ at HAVE_RUBY_TRUE@	$(MKDIR_P) $(DESTDIR)$(RUBY_VENDORARCH)
 ++ at HAVE_RUBY_TRUE@	$(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_VENDORLIB)
 ++ at HAVE_RUBY_TRUE@	$(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_VENDORARCH)
 + 
 + # Tell versions [3.59,3.63) of GNU make to not export all variables.
 + # Otherwise a system limit (for SysV at least) may be exceeded.
 +diff --git a/ruby/examples/Makefile.in b/ruby/examples/Makefile.in
- index dd7fd1d..265670f 100644
++index 2021a0f..35eeb4c 100644
 +--- a/ruby/examples/Makefile.in
 ++++ b/ruby/examples/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -33,6 +33,23 @@
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -93,24 +110,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -177,6 +194,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1285,11 +1307,18 @@ clean-libtool:
++@@ -1287,11 +1309,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man3: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
 +-	@list=''; test -n "$(man3dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.3[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man3dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.3[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
- index 01f7a83..873e79a 100644
++index aad9693..b7657bf 100644
 +--- a/sparsify/Makefile.in
 ++++ b/sparsify/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -113,24 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -225,6 +242,11 @@ AM_V_at = $(am__v_at_ at AM_V@)
 + am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + man1dir = $(mandir)/man1
 + NROFF = nroff
 + MANS = $(man_MANS)
- @@ -1343,8 +1365,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1345,8 +1367,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binSCRIPTS: $(bin_SCRIPTS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- @@ -1381,11 +1406,18 @@ clean-libtool:
++@@ -1383,11 +1408,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/src/Makefile.in b/src/Makefile.in
- index b8c133e..06dc19a 100644
++index 0248e99..c8a48dd 100644
 +--- a/src/Makefile.in
 ++++ b/src/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -52,6 +52,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
- @@ -292,6 +309,11 @@ SOURCES = $(liberrnostring_la_SOURCES) $(libguestfs_la_SOURCES) \
++@@ -114,24 +131,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
++@@ -293,6 +310,11 @@ SOURCES = $(liberrnostring_la_SOURCES) $(libguestfs_la_SOURCES) \
 + 	$(libprotocol_la_SOURCES)
 + DIST_SOURCES = $(liberrnostring_la_SOURCES) $(libguestfs_la_SOURCES) \
 + 	$(libprotocol_la_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + man3dir = $(mandir)/man3
 + NROFF = nroff
 + MANS = $(man_MANS)
- @@ -1502,7 +1524,6 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-  $(am__aclocal_m4_deps):
++@@ -1512,7 +1534,6 @@ libguestfs.pc: $(top_builddir)/config.status $(srcdir)/libguestfs.pc.in
++ 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 + install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 + 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 + 	list2=; for p in $$list; do \
 + 	  if test -f $$p; then \
- @@ -1510,6 +1531,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++@@ -1520,6 +1541,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 + 	  else :; fi; \
 + 	done; \
 + 	test -z "$$list2" || { \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(libdir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 + 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 + 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 + 	}
- @@ -1758,11 +1781,18 @@ clean-libtool:
++@@ -1768,11 +1791,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man3: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
 +-	@list=''; test -n "$(man3dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.3[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man3dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.3[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
- @@ -1794,8 +1824,11 @@ uninstall-man3:
++@@ -1804,8 +1834,11 @@ uninstall-man3:
 + 	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
++ install-pkgconfigDATA: $(pkgconfig_DATA)
++ 	@$(NORMAL_INSTALL)
++-	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
++ 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
+++	if test -n "$$list"; then \
+++	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
+++	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
+++	fi; \
++ 	for p in $$list; do \
++ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ 	  echo "$$d$$p"; \
++@@ -1822,8 +1855,11 @@ uninstall-pkgconfigDATA:
++ 	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 + install-includeHEADERS: $(include_HEADERS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
 + 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
- +	  $(MKDIR_P) '$(DESTDIR)$(includedir)' || exit 1; \
+++	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; \
 +diff --git a/test-tool/Makefile.in b/test-tool/Makefile.in
- index 42ff2b9..6d845f6 100644
++index 6f7cada..5a4a685 100644
 +--- a/test-tool/Makefile.in
 ++++ b/test-tool/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -50,6 +50,23 @@
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -112,24 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -229,6 +246,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(libguestfs_test_tool_SOURCES)
 + DIST_SOURCES = $(libguestfs_test_tool_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 + am__vpath_adj = case $$p in \
 +     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- @@ -1337,8 +1359,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1339,8 +1361,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binPROGRAMS: $(bin_PROGRAMS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do echo "$$p $$p"; done | \
 + 	sed 's/$(EXEEXT)$$//' | \
 + 	while read p p1; do if test -f $$p || test -f $$p1; \
- @@ -1432,11 +1457,18 @@ clean-libtool:
++@@ -1434,11 +1459,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \
 +diff --git a/tests/c-api/Makefile.in b/tests/c-api/Makefile.in
- index 7703d75..76063c0 100644
++index f04cd6f..f336a87 100644
 +--- a/tests/c-api/Makefile.in
 ++++ b/tests/c-api/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -120,24 +137,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -310,6 +327,11 @@ DIST_SOURCES = $(test_add_drive_opts_SOURCES) $(test_command_SOURCES) \
 + 	$(test_debug_to_file_SOURCES) $(test_just_header_SOURCES) \
 + 	$(test_last_errno_SOURCES) $(test_private_data_SOURCES) \
 + 	$(test_user_cancel_SOURCES) $(tests_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + ETAGS = etags
 + CTAGS = ctags
 + am__tty_colors = \
 +diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in
- index 6826764..c91b920 100644
++index 0a6a65f..d0dd90a 100644
 +--- a/tests/data/Makefile.in
 ++++ b/tests/data/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -50,6 +50,23 @@
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -111,24 +128,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -195,6 +212,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DATA = $(noinst_DATA)
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 + pkglibexecdir = @pkglibexecdir@
 +diff --git a/tests/extra/Makefile.in b/tests/extra/Makefile.in
- index 4fc8ea8..15b2324 100644
++index e9b18fa..8d16a3b 100644
 +--- a/tests/extra/Makefile.in
 ++++ b/tests/extra/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -68,6 +68,23 @@
 + #   - hard to test because guestmount forks into the background, and
 + #     if valgrind reports errors it doesn't stop the test shell script
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -128,24 +145,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -212,6 +229,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 + pkglibexecdir = @pkglibexecdir@
 + ACLOCAL = @ACLOCAL@
 +diff --git a/tests/guests/Makefile.in b/tests/guests/Makefile.in
- index 1c19524..350d1d7 100644
++index fa65336..596bb9b 100644
 +--- a/tests/guests/Makefile.in
 ++++ b/tests/guests/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -110,24 +127,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -194,6 +211,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 + pkglibexecdir = @pkglibexecdir@
 + ACLOCAL = @ACLOCAL@
 +diff --git a/tests/luks/Makefile.in b/tests/luks/Makefile.in
- index ed59f13..04eb947 100644
++index 87246ee..6cdadb2 100644
 +--- a/tests/luks/Makefile.in
 ++++ b/tests/luks/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -110,24 +127,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -194,6 +211,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__tty_colors = \
 + red=; grn=; lgn=; blu=; std=
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +diff --git a/tests/lvm/Makefile.in b/tests/lvm/Makefile.in
- index 5ce69ce..9855027 100644
++index 9aaf67f..d60973d 100644
 +--- a/tests/lvm/Makefile.in
 ++++ b/tests/lvm/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -110,24 +127,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -194,6 +211,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__tty_colors = \
 + red=; grn=; lgn=; blu=; std=
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +diff --git a/tests/md/Makefile.in b/tests/md/Makefile.in
- index 4b5910f..253115f 100644
++index 84526b9..3884864 100644
 +--- a/tests/md/Makefile.in
 ++++ b/tests/md/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -110,24 +127,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -194,6 +211,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__tty_colors = \
 + red=; grn=; lgn=; blu=; std=
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +diff --git a/tests/protocol/Makefile.in b/tests/protocol/Makefile.in
- index 81e87be..778ca7f 100644
++index 0be4f3e..a2dbbfd 100644
 +--- a/tests/protocol/Makefile.in
 ++++ b/tests/protocol/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -110,24 +127,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -194,6 +211,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__tty_colors = \
 + red=; grn=; lgn=; blu=; std=
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +diff --git a/tests/qemu/Makefile.in b/tests/qemu/Makefile.in
- index aa1b497..58038c0 100644
++index c6244f0..bee3a91 100644
 +--- a/tests/qemu/Makefile.in
 ++++ b/tests/qemu/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -53,6 +53,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -114,24 +131,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + am__tty_colors = \
 + red=; grn=; lgn=; blu=; std=
 + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +diff --git a/tests/regressions/Makefile.in b/tests/regressions/Makefile.in
- index fd84021..9ed335e 100644
++index 1d9b88f..5b4f360 100644
 +--- a/tests/regressions/Makefile.in
 ++++ b/tests/regressions/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -49,6 +49,23 @@
 + # along with this program; if not, write to the Free Software
 + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -115,24 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -234,6 +251,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 + am__v_GEN_0 = @echo "  GEN   " $@;
 + SOURCES = $(rhbz501893_SOURCES) $(rhbz790721_SOURCES)
 + DIST_SOURCES = $(rhbz501893_SOURCES) $(rhbz790721_SOURCES)
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + ETAGS = etags
 + CTAGS = ctags
 + am__tty_colors = \
 +diff --git a/tools/Makefile.in b/tools/Makefile.in
- index 9e7c2a3..9ce884b 100644
++index 9dfc1a8..1a94d1b 100644
 +--- a/tools/Makefile.in
 ++++ b/tools/Makefile.in
 +@@ -1,4 +1,4 @@
 +-# Makefile.in generated by automake 1.11.3 from Makefile.am.
- +# Makefile.in generated by automake 1.11.4 from Makefile.am.
+++# Makefile.in generated by automake 1.11.5 from Makefile.am.
 + # @configure_input@
 + 
 + # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 +@@ -51,6 +51,23 @@
 + 
 + 
 + VPATH = @srcdir@
 ++am__make_dryrun = \
 ++  { \
 ++    am__dry=no; \
 ++    case $$MAKEFLAGS in \
 ++      *\\[\ \	]*) \
 ++        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 ++          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 ++      *) \
 ++        for am__flg in $$MAKEFLAGS; do \
 ++          case $$am__flg in \
 ++            *=*|--*) ;; \
 ++            *n*) am__dry=yes; break;; \
 ++          esac; \
 ++        done;; \
 ++    esac; \
 ++    test $$am__dry = yes; \
 ++  }
 + pkgdatadir = $(datadir)/@PACKAGE@
 + pkgincludedir = $(includedir)/@PACKAGE@
 + pkglibdir = $(libdir)/@PACKAGE@
++@@ -112,24 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/inttostr.m4 \
++ 	$(top_srcdir)/m4/inttypes-pri.m4 $(top_srcdir)/m4/inttypes.m4 \
++ 	$(top_srcdir)/m4/inttypes_h.m4 $(top_srcdir)/m4/ioctl.m4 \
++-	$(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lcmessage.m4 \
++-	$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
++-	$(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \
++-	$(top_srcdir)/m4/localcharset.m4 $(top_srcdir)/m4/locale-fr.m4 \
++-	$(top_srcdir)/m4/locale-ja.m4 $(top_srcdir)/m4/locale-tr.m4 \
++-	$(top_srcdir)/m4/locale-zh.m4 $(top_srcdir)/m4/locale_h.m4 \
++-	$(top_srcdir)/m4/localename.m4 $(top_srcdir)/m4/lock.m4 \
++-	$(top_srcdir)/m4/longlong.m4 $(top_srcdir)/m4/lseek.m4 \
++-	$(top_srcdir)/m4/lstat.m4 $(top_srcdir)/m4/ltoptions.m4 \
++-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
++-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/malloc.m4 \
++-	$(top_srcdir)/m4/malloca.m4 $(top_srcdir)/m4/manywarnings.m4 \
++-	$(top_srcdir)/m4/mbrtowc.m4 $(top_srcdir)/m4/mbsinit.m4 \
++-	$(top_srcdir)/m4/mbsrtowcs.m4 $(top_srcdir)/m4/mbstate_t.m4 \
++-	$(top_srcdir)/m4/mbtowc.m4 $(top_srcdir)/m4/memchr.m4 \
++-	$(top_srcdir)/m4/mempcpy.m4 $(top_srcdir)/m4/memrchr.m4 \
++-	$(top_srcdir)/m4/mkdtemp.m4 $(top_srcdir)/m4/mmap-anon.m4 \
++-	$(top_srcdir)/m4/mode_t.m4 $(top_srcdir)/m4/msvc-inval.m4 \
+++	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+++	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+++	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/localcharset.m4 \
+++	$(top_srcdir)/m4/locale-fr.m4 $(top_srcdir)/m4/locale-ja.m4 \
+++	$(top_srcdir)/m4/locale-tr.m4 $(top_srcdir)/m4/locale-zh.m4 \
+++	$(top_srcdir)/m4/locale_h.m4 $(top_srcdir)/m4/localename.m4 \
+++	$(top_srcdir)/m4/lock.m4 $(top_srcdir)/m4/longlong.m4 \
+++	$(top_srcdir)/m4/lseek.m4 $(top_srcdir)/m4/lstat.m4 \
+++	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+++	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+++	$(top_srcdir)/m4/malloc.m4 $(top_srcdir)/m4/malloca.m4 \
+++	$(top_srcdir)/m4/manywarnings.m4 $(top_srcdir)/m4/mbrtowc.m4 \
+++	$(top_srcdir)/m4/mbsinit.m4 $(top_srcdir)/m4/mbsrtowcs.m4 \
+++	$(top_srcdir)/m4/mbstate_t.m4 $(top_srcdir)/m4/mbtowc.m4 \
+++	$(top_srcdir)/m4/memchr.m4 $(top_srcdir)/m4/mempcpy.m4 \
+++	$(top_srcdir)/m4/memrchr.m4 $(top_srcdir)/m4/mkdtemp.m4 \
+++	$(top_srcdir)/m4/mmap-anon.m4 $(top_srcdir)/m4/mode_t.m4 \
+++	$(top_srcdir)/m4/msvc-inval.m4 \
++ 	$(top_srcdir)/m4/msvc-nothrow.m4 $(top_srcdir)/m4/multiarch.m4 \
++ 	$(top_srcdir)/m4/netdb_h.m4 $(top_srcdir)/m4/netinet_in_h.m4 \
++ 	$(top_srcdir)/m4/nocrash.m4 $(top_srcdir)/m4/ocaml.m4 \
 +@@ -225,6 +242,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 + am__v_at_0 = @
 + SOURCES =
 + DIST_SOURCES =
 ++am__can_run_installinfo = \
 ++  case $$AM_UPDATE_INFO_DIR in \
 ++    n|no|NO) false;; \
 ++    *) (install-info --version) >/dev/null 2>&1;; \
 ++  esac
 + man1dir = $(mandir)/man1
 + NROFF = nroff
 + MANS = $(man_MANS)
- @@ -1325,8 +1347,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++@@ -1327,8 +1349,11 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 + $(am__aclocal_m4_deps):
 + install-binSCRIPTS: $(bin_SCRIPTS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 + 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 ++	if test -n "$$list"; then \
 ++	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 ++	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 ++	fi; \
 + 	for p in $$list; do \
 + 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 + 	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
- @@ -1363,11 +1388,18 @@ clean-libtool:
++@@ -1365,11 +1390,18 @@ clean-libtool:
 + 	-rm -rf .libs _libs
 + install-man1: $(man_MANS)
 + 	@$(NORMAL_INSTALL)
 +-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
 +-	@list=''; test -n "$(man1dir)" || exit 0; \
 +-	{ for i in $$list; do echo "$$i"; done; \
 +-	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
 +-	  sed -n '/\.1[a-z]*$$/p'; \
 ++	@list1=''; \
 ++	list2='$(man_MANS)'; \
 ++	test -n "$(man1dir)" \
 ++	  && test -n "`echo $$list1$$list2`" \
 ++	  || exit 0; \
 ++	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 ++	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 ++	{ for i in $$list1; do echo "$$i"; done;  \
 ++	if test -n "$$list2"; then \
 ++	  for i in $$list2; do echo "$$i"; done \
 ++	    | sed -n '/\.1[a-z]*$$/p'; \
 ++	fi; \
 + 	} | while read p; do \
 + 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 + 	  echo "$$d$$p"; echo "$$p"; \

-- 
Libguestfs Debian packaging



More information about the Pkg-libvirt-commits mailing list