[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:44 UTC 2013
The following commit has been merged in the master branch:
commit b8ca9bc4436ae10c0be90abf0c6c93ea0f47f7be
Merge: 08dfa0c3e35c480485b8e11dd222d0a639198c08 9f65893da9ea636552717af1783e46b11e253e1b
Author: Hilko Bengen <bengen at debian.org>
Date: Thu May 24 00:21:37 2012 +0200
Imported Debian patch 1:1.18.0-1
diff --combined debian/changelog
index e0f3712,0000000..c91ba2f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,592 -1,0 +1,600 @@@
++libguestfs (1:1.18.0-1) unstable; urgency=low
++
++ * New upstream version
++ * [e839f2b] Added gettext-ocaml build dependency
++ * [8e29504] Rebased patch queue, added several patches
++
++ -- Hilko Bengen <bengen at debian.org> Thu, 24 May 2012 00:21:37 +0200
++
+libguestfs (1:1.16.23-1) unstable; urgency=low
+
+ * New upstream version
+ * [33efe9d] Rebased patch queue
+
+ -- Hilko Bengen <bengen at debian.org> Sat, 19 May 2012 15:16:38 +0200
+
+libguestfs (1:1.16.22-1) unstable; urgency=low
+
+ * New upstream version
+ * [8cc5ad4] Rebased patch queue
+
+ -- Hilko Bengen <bengen at debian.org> Mon, 14 May 2012 22:58:16 +0200
+
+libguestfs (1:1.16.21-1) unstable; urgency=low
+
+ * New upstream version
+ * Rebased patch queue
+
+ -- 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
+
+ * [2c44147] Build-depend on aptitude since Ubuntu needs it.
+ * [d50fd25] New patch 0005-Check-for-service-and-use-it-if-it-s- there.patch
+ Check for service and use it if it's there
+ * [40dc6b0] New patch 0006-Check-for-grub-menu.lst-if-etc-grub.conf-
+ can-t-be-fo.patch Check for grub/menu.lst if /etc/grub.conf can't be found
+ * [465def2] New patch 0007-Debina-package-format-is-called-deb-not-
+ dpkg.patch Debina package format is called 'deb' not 'dpkg'
+ * [1b7efb4] New patch 0008-Add-application-listing-for-Debian.patch Add
+ application listing for Debian
+ * [5dd34c9] Add series file
+ * [647fd84] Don't remove gmo files (Closes: #571117)
+
+ -- Guido Günther <agx at sigxcpu.org> Wed, 24 Feb 2010 18:22:58 +0100
+
+libguestfs (1.0.84-3) unstable; urgency=low
+
+ * [307bd4e] Add hivex commands.
+ * [7fac596] Build and install fuse helper
+ * [09ea683] Include all virt-* tools including virt-win-reg
+ * [ae3ee70] New patch 0004-Disable-fuser-tests-if-dev-fuse-doesn-t-
+ exist.patch Disable fuse tests if /dev/fuse doesn't exist
+
+ -- Guido Günther <agx at sigxcpu.org> Sun, 21 Feb 2010 19:40:43 +0100
+
+libguestfs (1.0.84-2) unstable; urgency=low
+
+ * [0195df4] Add vendor detection for Ubuntu
+ * [2fa535e] {Build-,}Depend on bochsbios and vgabios These are only
+ recommends but needed to run qemu during the tests.
+ * [ee483bf] Reenable tests
+ * [67fd975] New patch 0003-scrub-now-available-on-Debian.patch scrub now
+ available on Debian
+ * [2e9c89d] New patch 0004-Adjust-error-output-for-regressions-
+ rhbz557655.patch Adjust error output for regressions/rhbz557655
+ * [c5d5f9e] Adjust install-kernel to new debirf version
+ * [9c1fbdf] Drop Hardcode-kernel-version.patch - superflous due to previous
+ commit.
+
+ -- Guido Günther <agx at sigxcpu.org> Sun, 21 Feb 2010 13:24:01 +0100
+
+libguestfs (1.0.84-1) unstable; urgency=low
+
+ [ Guido Günther ]
+ * [1149b4a] add missing modules for vfat
+
+ [ Laurent Léonard ]
+ * [397dbf3] Imported Upstream version 1.0.80
+ * [ca95c7a] Drop patch 0001-add-nls_base.ko-and-nls_cp437.ko-for-
+ vfat.patch. Fixed upstream.
+ * [344c7e6] Add dependency on mkisofs.
+
+ [ Guido Günther ]
+ * [5aa8061] Add missing build-deps needed for ./configure
+ * [f8a682d] Imported Upstream version 1.0.84
+ * [e35175c] No need to manually install virt-inspector anymore
+ * [de6ddf1] Depend on python-all-dev since libguestfs handles python
+ 2.6 too
+ * [a2be87e] don't use the host's MAC address
+ * [88b70ef] New patch 0001-Disable-checks-for-now.patch Disable checks for
+ now
+ * [2b59394] New patch 0002-Run-debirf-as-root.patch Run debirf as root
+ * [e798002] New patch 0003-Hardcode-kernel-version.patch Hardcode kernel
+ version
+ * [602fab3] reenable patch system
+
+ -- Guido Günther <agx at sigxcpu.org> Sat, 20 Feb 2010 14:11:50 +0100
+
+libguestfs (1.0.61-1) unstable; urgency=low
+
+ * [831bc5f] Imported Upstream version 1.0.61
+ * [b85412e] run checks but disable currently failing tests
+ * [21d7e00] add missing qemu build-dep
+ * [0636bb4] add missing build-dep for perl bindings
+ * [5585a82] add missing build-deps for perl based tools
+ * [e09005c] install virt-df and virt-cat
+ * [342f8e4] install Lib.pm for perl bindings
+
+ -- Guido Günther <agx at sigxcpu.org> Fri, 17 Jul 2009 22:32:07 +0200
+
+libguestfs (1.0.56-1) unstable; urgency=low
+
+ * [1b77dc8] Imported Upstream version 1.0.56
+ * [0ca461d] drop a all patches merged upstream or superfluous since
+ we're building from a released version now.
+ * [474dc39] no need to call autogen.sh
+ * [32c3d61] amke sure the symlinks get created in time
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 09 Jul 2009 16:44:21 +0200
+
+libguestfs (1.0.54+44git127ad3-3) unstable; urgency=low
+
+ * [a6e6cc7] add virt-inspector
+ * [1446178] build-dep on libaugeas-dev for augeas support in guestfsd
+ * [b3769ed] select kernel by architecture
+ * [103069f] speed up appliance startup
+ * [aa02c11] document changes and release 1.0.54+44git127ad3-3
+
+ -- Guido Günther <agx at sigxcpu.org> Sat, 04 Jul 2009 17:58:04 +0200
+
+libguestfs (1.0.54+44git127ad3-2) unstable; urgency=low
+
+ * [8f1cea9] add missing shlibs dependency
+ * [35663fe] shorten long descriptions a bit
+ * [1631e0e] add watch file
+ * [adebbd1] drop lib from python package name
+ * [a24e6b9] add perl bindings
+ * [cc2117e] don't run dh_makeshlibs on python lib to avoid ldconfig call
+ * [d361e06] add missing ${misc:Depends}, {perl:Depends} and tighten
+ dependency on libguestfs
+
+ -- Guido Günther <agx at sigxcpu.org> Fri, 03 Jul 2009 12:03:14 +0200
+
+libguestfs (1.0.54+44git127ad3-1) unstable; urgency=low
+
+ * [4cea8bd] Imported Upstream version 1.0.54+44git127ad3
+ * [c01721f] switch to cdbs:
+ * add doc package
+ * add debug package
+ * add python bindings
+ * drop README.Debian
+ * set maintainer to pkg-libvirt team
+ * [91fafca] don't call configure, leave this to cdbs and make autoconf copy
+ files instead of symlinking so dpkg-source can create a proper .diff.gz
+ * [13207b9] drop .gitignore
+ * [967d228] touch fakeroot.log to indicate the appliance has been built
+ * [3477d95] use AM_MAINTAINER_MODE
+
+ -- Guido Günther <agx at sigxcpu.org> Thu, 02 Jul 2009 21:49:44 +0200
+
+libguestfs (1.0.41-1) unstable; urgency=low
+
+ * New upstream release 1.0.41.
+
+ -- Richard Jones <rjones at redhat.com> Thu, 04 Jun 2009 16:10:38 +0100
+
+libguestfs (1.0.31-1) unstable; urgency=low
+
+ * Initial release (Closes: #530427)
+
+ -- Richard Jones <rjones at redhat.com> Sun, 24 May 2009 21:43:45 +0100
diff --combined debian/control
index fe8d8ce,0000000..93484b9
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,302 -1,0 +1,302 @@@
+Source: libguestfs
+Section: libs
+Priority: extra
+Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
+Uploaders: Richard Jones <rjones at redhat.com>, Guido Günther <agx at sigxcpu.org>, Hilko Bengen <bengen at debian.org>
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, aptitude,
+ po-debconf, bash-completion,
+ febootstrap (>= 3.2),
+ libreadline-dev, libaugeas-dev, libselinux1-dev, libhivex-dev, libvirt-dev,
+ libmagic-dev, libncurses5-dev, libpcre3-dev, libxml2-dev,
+ libconfig-dev, libc-dev-bin, systemtap-sdt-dev,
+ automake, autoconf, libtool,
+ gperf, libxml2-utils,
+ qemu-kvm (>= 0.13),
+ genisoimage, pkg-config,
+ erlang-dev,
- dh-ocaml, ocaml, ocaml-findlib, libpcre-ocaml-dev,
++ dh-ocaml, ocaml, ocaml-findlib, libpcre-ocaml-dev, libgettext-ocaml-dev,
+ python (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~), python3-all-dev,
+ default-jdk,
+ gem2deb, rake,
+ libtest-pod-coverage-perl, libextutils-command-perl, libintl-perl, libtest-pod-perl,
+ libstring-shellquote-perl,
+ libsys-virt-perl, libwin-hivex-perl,
+ libfuse-dev, fuse-utils,
+ libglib2.0-dev, gjs, gobject-introspection, libgirepository1.0-dev,
+ netpbm, icoutils
+Homepage: http://libguestfs.org
+Standards-Version: 3.9.3
+Vcs-Git: git://git.debian.org/git/pkg-libvirt/libguestfs.git
+Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/libguestfs.git
+XS-Ruby-Versions: all
+
+Package: guestfish
+Section: admin
+Architecture: i386 amd64
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: guest disk image management system - file system shell
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ Guestfish is a shell and command-line tool for examining and modifying
+ virtual machine file systems. It uses libguestfs and exposes all of the
+ functionality of the guestfs API; see guestfs(3).
+
+Package: guestfsd
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ bsdmainutils,
+ diffutils,
+# grub-pc,
+ iproute,
+ libaugeas0,
+ udev,
+ binutils,
+ cpio,
+ dosfstools,
+ file,
+ lsof,
+ module-init-tools,
+ net-tools,
+ parted,
+ procps,
+ scrub,
+ strace,
+ zerofree
+Description: Daemon to access to guest virtual machine through virtio serial
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains a standalone version the back-end daemon that
+ carries out file system access on behalf of libguestfs applications.
+ It is not needed for regular operation.
+
+Package: libguestfs-dev
+Section: libdevel
+Architecture: i386 amd64
+Depends: libguestfs0 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libguestfs0 (<< 1:1.14.9-1~)
+Description: guest disk image management system - development headers
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains the development headers.
+
+Package: libguestfs0
+Section: libs
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ febootstrap (>= 3.2),
+ qemu-kvm (>= 0.13),
+ bsdmainutils,
+ btrfs-tools,
+ cryptsetup,
+ diffutils,
+# gfs-tools,
+# gfs2-tools,
+# grub-pc,
+# hfsplus,
+ iproute,
+ libaugeas0,
+# nilfs2-tools,
+ ntfs-3g,
+ ntfs-3g (>> 1:2011.10.9AR.1-4~) | ntfsprogs,
+ reiserfsprogs,
+ udev,
+ vim-tiny,
+ xz-utils,
+ zfs-fuse,
+ binutils,
+ cpio,
+ dosfstools,
+ file,
+ jfsutils,
+ lsof,
+ lvm2,
+ module-init-tools,
+ net-tools,
+ parted,
+ procps,
+ scrub,
+ strace,
+ xfsprogs,
+ zerofree,
+ netpbm, icoutils
+Description: guest disk image management system - shared library
+ The libguestfs library allows accessing and modifying guest disk
+ images. It offers the following features, among many others:
+ * making batch configuration changes to guests;
+ * viewing and editing files inside guests;
+ * getting disk used/free statistics;
+ * migrating between virtualization systems;
+ * performing partial backups;
+ * performing partial guest clones;
+ * cloning guests and changing registry/UUID/hostname info.
+ .
+ It uses the Linux kernel and qemu code, and can access any type of guest
+ file system that Linux and qemu can, including but not limited to: ext2/3/4,
+ btrfs, FAT and NTFS, LVM, many different disk partition schemes, qcow, qcow2,
+ vmdk.
+ .
+ The library provides ways to enumerate guest storage (such as partitions, LVs,
+ what file system is in each LV, etc.); to run commands in the context of the
+ guest; and to upload and download files and directories.
+
+Package: guestmount
+Section: admin
+Architecture: i386 amd64
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: guest disk image management system - FUSE mount utility
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ The guestmount utility can be used to mount virtual machine file systems and
+ other disk images on the host. It uses libguestfs for access to the guest
+ file system, and FUSE ("File system in USErspace") to make it appear as a
+ mountable device.
+
+Package: libguestfs-tools
+Section: admin
+Architecture: i386 amd64
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
+ libsys-virt-perl, libguestfs-perl (= ${binary:Version}),
+ libwin-hivex-perl,
+ libintl-perl, libstring-shellquote-perl
+Description: guest disk image management system - tools
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains virtualization tools, including virt-cat, virt-df,
+ virt-edit, virt-filesystems, virt-inspector, virt-ls, virt-make-fs,
+ virt-rescue, virt-resize, virt-tar, and virt-win-reg.
+
+Package: libguestfs0-dbg
+Section: debug
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libguestfs0 (= ${binary:Version})
+Description: guest disk image management system - debug symbols
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains the debugging symbols.
+
+Package: python-guestfs
+Section: python
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libguestfs0 (= ${binary:Version})
+Provides: python-libguestfs
+Conflicts: python-libguestfs, libguestfs-dev (<< 1:1.14.9-1~)
+Description: guest disk image management system - Python bindings
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains the Python bindings.
+
+Package: libguestfs-perl
+Section: perl
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libguestfs0 (= ${binary:Version}),
+ ${perl:Depends},
+ libxml-xpath-perl,
+ libwin-hivex-perl,
+ libsys-virt-perl
+Description: guest disk image management system - Perl bindings
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains the Perl bindings.
+
+Package: libguestfs-ocaml
+Section: ocaml
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libguestfs0 (= ${binary:Version}),
+ ${ocaml:Depends}
+Provides: ${ocaml:Provides}
+Description: guest disk image management system - OCaml bindings
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package includes the OCaml shared runtime stub libraries.
+
+Package: libguestfs-ocaml-dev
+Section: ocaml
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libguestfs0 (= ${binary:Version}),
+ libguestfs-dev (= ${binary:Version}),
+ ${ocaml:Depends}
+Provides: ${ocaml:Provides}
+Conflicts: libguestfs-dev (<< 1:1.14.9-1~)
+Description: guest disk image management system - OCaml development files
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains all the files needed to develop OCaml programs
+ which use OCaml bindings to libguestfs.
+
+Package: erlang-guestfs
+Section: interpreters
+Architecture: i386 amd64
+Depends: ${erlang-base:Depends}, ${erlang-abi:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libguestfs-dev (<< 1:1.14.9-1~)
+Description: guest disk image management system - Erlang bindings
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains Erlang bindings to libguestfs.
+
+Package: libguestfs-java
+Section: java
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libguestfs-dev (<< 1:1.15.15-1~)
+Description: guest disk image management system - Java bindings
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains Java bindings to libguestfs.
+
+Package: ruby-guestfs
+Section: ruby
+XB-Ruby-Versions: ${ruby:Versions}
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Conflicts: libguestfs-dev (<< 1:1.15.15-1~)
+Description: guest disk image management system - Ruby bindings
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains Ruby bindings to libguestfs.
+
+Package: libguestfs-gobject-1.0-0
+Section: libs
+Architecture: i386 amd64
+Depends: libguestfs0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libguestfs0 (<< 1:1.14.9-1~)
+Description: guest disk image management system - GObject bindings
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains the GObject bindings.
+
+Package: libguestfs-gobject-dev
+Section: libdevel
+Architecture: i386 amd64
+Depends: libguestfs-gobject-1.0-0 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libguestfs0 (<< 1:1.14.9-1~)
+Description: guest disk image management system - GObject development headers
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains the development headers for the GObject bindings.
+
+Package: gir1.2-guestfs-1.0
+Section: introspection
+Architecture: i386 amd64
+Depends: libguestfs-gobject-1.0-0 (= ${binary:Version}), ${gir:Depends}, ${misc:Depends}
+Conflicts: libguestfs0 (<< 1:1.14.9-1~)
+Description: guest disk image management system - GObject introspection files
+ The libguestfs library allows accessing and modifying guest disk
+ images.
+ .
+ This package contains the GObject introspection data.
diff --combined debian/patches/0003-Fix-for-systemd-based-Debian-systems.patch
index 0b14528,0000000..0b14528
mode 100644,000000..100644
--- a/debian/patches/0003-Fix-for-systemd-based-Debian-systems.patch
+++ b/debian/patches/0003-Fix-for-systemd-based-Debian-systems.patch
@@@ -1,20 -1,0 +1,20 @@@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 11 Aug 2011 00:24:11 +0200
+Subject: Fix for systemd-based Debian systems
+
+---
+ appliance/make.sh.in | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/appliance/make.sh.in b/appliance/make.sh.in
+index 0335f6e..d541227 100755
+--- a/appliance/make.sh.in
++++ b/appliance/make.sh.in
+@@ -63,4 +63,7 @@ if grep -q /usr/share/augeas/lenses supermin.d/hostfiles-t; then
+ echo "/usr/share/augeas/lenses/*.aug" >> supermin.d/hostfiles-t
+ fi
+
++# Make sure that /init can be run on systemd-enabled Debian systems
++echo '/lib/lsb/*' >> supermin.d/hostfiles-t
++
+ mv supermin.d/hostfiles-t supermin.d/hostfiles
diff --combined debian/patches/0004-out-of-tree-build-fix-building-Perl-bindings.patch
index 3a52df7,0000000..3a52df7
mode 100644,000000..100644
--- a/debian/patches/0004-out-of-tree-build-fix-building-Perl-bindings.patch
+++ b/debian/patches/0004-out-of-tree-build-fix-building-Perl-bindings.patch
@@@ -1,20 -1,0 +1,20 @@@
+From: Hilko Bengen <bengen at debian.org>
+Date: Sat, 13 Aug 2011 22:11:10 +0200
+Subject: out-of-tree build: fix building Perl bindings
+
+---
+ perl/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/perl/Makefile.am b/perl/Makefile.am
+index 404a4e9..253d990 100644
+--- a/perl/Makefile.am
++++ b/perl/Makefile.am
+@@ -65,6 +65,7 @@ all: Makefile-pl src_deps
+ $(MAKE) -f Makefile-pl
+
+ Makefile-pl: Makefile.PL
++ -[ $(srcdir) != $(builddir) ] && cp -rsu $(abs_srcdir)/. $(builddir)/.
+ perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
+
+ # No! Otherwise it is deleted before the clean-local rule runs.
diff --combined debian/patches/0005-out-of-tree-build-daemon.patch
index 0000000,0000000..0495ea4
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-out-of-tree-build-daemon.patch
@@@ -1,0 -1,0 +1,25 @@@
++From: Hilko Bengen <bengen at debian.org>
++Date: Mon, 15 Aug 2011 00:48:11 +0200
++Subject: out-of-tree build: daemon
++
++---
++ daemon/Makefile.am | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/daemon/Makefile.am b/daemon/Makefile.am
++index 02c21df..c33758f 100644
++--- a/daemon/Makefile.am
+++++ b/daemon/Makefile.am
++@@ -42,10 +42,10 @@ noinst_LIBRARIES = libprotocol.a
++ libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h
++ libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
++
++-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 --combined debian/patches/0006-ruby-install-to-vendor_ruby.patch
index 40978ea,0000000..40978ea
mode 100644,000000..100644
--- a/debian/patches/0006-ruby-install-to-vendor_ruby.patch
+++ b/debian/patches/0006-ruby-install-to-vendor_ruby.patch
@@@ -1,32 -1,0 +1,32 @@@
+From: Hilko Bengen <bengen at debian.org>
+Date: Thu, 17 Nov 2011 23:56:15 +0100
+Subject: ruby: install to vendor_ruby.
+
+---
+ ruby/Makefile.am | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/ruby/Makefile.am b/ruby/Makefile.am
+index c4b680f..db6ec9e 100644
+--- a/ruby/Makefile.am
++++ b/ruby/Makefile.am
+@@ -54,13 +54,13 @@ all: $(generator_built)
+ $(RAKE) build
+ $(RAKE) rdoc
+
+-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitelibdir']")
+-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchdir']")
++RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorlibdir']")
++RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['vendorarchdir']")
+
+ install:
+- $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
+- $(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
+- $(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_SITELIB)
+- $(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_SITEARCH)
++ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
++ $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORARCH)
++ $(INSTALL) -p -m 0644 $(srcdir)/lib/guestfs.rb $(DESTDIR)$(RUBY_VENDORLIB)
++ $(INSTALL) -p -m 0755 $(builddir)/ext/guestfs/_guestfs.so $(DESTDIR)$(RUBY_VENDORARCH)
+
+ endif
diff --combined debian/patches/0007-Fix-out-of-tree-build-for-GObject-bindings.patch
index 0000000,0000000..04b6ec8
new file mode 100644
--- /dev/null
+++ b/debian/patches/0007-Fix-out-of-tree-build-for-GObject-bindings.patch
@@@ -1,0 -1,0 +1,30 @@@
++From: Hilko Bengen <bengen at debian.org>
++Date: Wed, 23 May 2012 13:53:39 +0200
++Subject: Fix out-of-tree build for GObject bindings
++
++---
++ gobject/Makefile.am | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/gobject/Makefile.am b/gobject/Makefile.am
++index be6d58e..f75bcf6 100644
++--- a/gobject/Makefile.am
+++++ b/gobject/Makefile.am
++@@ -58,7 +58,7 @@ libguestfs_gobject_1_0_la_LIBADD = -lguestfs
++ # in the subdirectory.
++ install-data-hook:
++ rm $(DESTDIR)$(includedir)/guestfs-gobject/guestfs-gobject.h
++- install -m 0644 include/guestfs-gobject.h $(DESTDIR)$(includedir)
+++ install -m 0644 $(srcdir)/include/guestfs-gobject.h $(DESTDIR)$(includedir)
++
++ -include $(INTROSPECTION_MAKEFILE)
++ INTROSPECTION_GIRS =
++@@ -75,7 +75,7 @@ Guestfs-1.0.gir: $(libname)
++ Guestfs_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
++ Guestfs_1_0_gir_CFLAGS = $(INCLUDES) -I$(srcdir)/include
++ Guestfs_1_0_gir_LIBS = $(libname)
++-Guestfs_1_0_gir_FILES = $(introspection_sources)
+++Guestfs_1_0_gir_FILES = $(patsubst %,$(srcdir)/%,$(introspection_sources))
++ INTROSPECTION_GIRS += Guestfs-1.0.gir
++
++ girdir = $(datadir)/gir-1.0
diff --combined debian/patches/0008-Split-off-GObject-tests-that-require-an-appliance.patch
index 0000000,0000000..ebf771e
new file mode 100644
--- /dev/null
+++ b/debian/patches/0008-Split-off-GObject-tests-that-require-an-appliance.patch
@@@ -1,0 -1,0 +1,71 @@@
++From: Hilko Bengen <bengen at debian.org>
++Date: Wed, 23 May 2012 22:11:58 +0200
++Subject: Split off GObject tests that require an appliance
++
++---
++ gobject/Makefile.am | 5 ++++-
++ gobject/run-live-tests | 26 ++++++++++++++++++++++++++
++ gobject/run-tests | 1 -
++ 3 files changed, 30 insertions(+), 2 deletions(-)
++ create mode 100755 gobject/run-live-tests
++
++diff --git a/gobject/Makefile.am b/gobject/Makefile.am
++index f75bcf6..5211fe4 100644
++--- a/gobject/Makefile.am
+++++ b/gobject/Makefile.am
++@@ -85,10 +85,13 @@ typelibdir = $(libdir)/girepository-1.0
++ typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
++
++ TESTS = run-tests
+++if ENABLE_APPLIANCE
+++TESTS += run-live-tests
+++endif ENABLE_APPLIANCE
++ TESTS_ENVIRONMENT = GJS=$(GJS)
++
++ $(TESTS): $(typelib_DATA)
++
++ CLEANFILES += $(gir_DATA) $(typelib_DATA)
++
++-endif
+++endif HAVE_INTROSPECTION
++diff --git a/gobject/run-live-tests b/gobject/run-live-tests
++new file mode 100755
++index 0000000..11e8f7b
++--- /dev/null
+++++ b/gobject/run-live-tests
++@@ -0,0 +1,26 @@
+++#!/bin/sh -
+++# libguestfs GObject bindings
+++# Copyright (C) 2012 Red Hat Inc.
+++#
+++# This program is free software; you can redistribute it and/or modify
+++# it under the terms of the GNU General Public License as published by
+++# the Free Software Foundation; either version 2 of the License, or
+++# (at your option) any later version.
+++#
+++# This program is distributed in the hope that it will be useful,
+++# but WITHOUT ANY WARRANTY; without even the implied warranty of
+++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+++# GNU General Public License for more details.
+++#
+++# You should have received a copy of the GNU General Public License
+++# along with this program; if not, write to the Free Software
+++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+++
+++set -e
+++
+++if [ -z "$GJS" ]; then
+++ echo "GObject bind tests skipped: gjs is missing"
+++ exit 0
+++fi
+++
+++../run $GJS $srcdir/tests-misc.js 2>/dev/null
++diff --git a/gobject/run-tests b/gobject/run-tests
++index d2ce0a6..55c489c 100755
++--- a/gobject/run-tests
+++++ b/gobject/run-tests
++@@ -26,4 +26,3 @@ fi
++ ../run $GJS $srcdir/bindtests.js > bindtests.tmp
++ diff -u ${srcdir}/../bindtests bindtests.tmp
++ ../run $GJS $srcdir/bindtests-manual.js 2>/dev/null
++-../run $GJS $srcdir/tests-misc.js 2>/dev/null
diff --combined debian/patches/0009-Fix-generation-of-gettext-stubs-for-out-of-tree-buil.patch
index 0000000,0000000..b7aba65
new file mode 100644
--- /dev/null
+++ b/debian/patches/0009-Fix-generation-of-gettext-stubs-for-out-of-tree-buil.patch
@@@ -1,0 -1,0 +1,21 @@@
++From: Hilko Bengen <bengen at debian.org>
++Date: Wed, 23 May 2012 22:13:11 +0200
++Subject: Fix generation of gettext stubs for out-of-tree builds
++
++---
++ configure.ac | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/configure.ac b/configure.ac
++index 5a969c2..c11a600 100644
++--- a/configure.ac
+++++ b/configure.ac
++@@ -815,7 +815,7 @@ AS_IF([test "x$OCAMLC" != "xno"],[
++ dnl Write gettext modules for each OCaml tool. If OCaml gettext
++ dnl is not available then we write dummy functions.
++ for program in resize sparsify sysprep; do
++- output=$program/${program}_gettext.ml
+++ output=$builddir/$program/${program}_gettext.ml
++ AC_MSG_NOTICE([creating $output])
++ rm -f $output
++
diff --combined debian/patches/0010-Fix-out-of-tree-build-install-target-for-translation.patch
index 0000000,0000000..0406800
new file mode 100644
--- /dev/null
+++ b/debian/patches/0010-Fix-out-of-tree-build-install-target-for-translation.patch
@@@ -1,0 -1,0 +1,21 @@@
++From: Hilko Bengen <bengen at debian.org>
++Date: Wed, 23 May 2012 22:30:43 +0200
++Subject: Fix out-of-tree build (install target) for translations
++
++---
++ po/Makefile.am | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/po/Makefile.am b/po/Makefile.am
++index 90b23c1..c620d57 100644
++--- a/po/Makefile.am
+++++ b/po/Makefile.am
++@@ -96,7 +96,7 @@ install-data-hook:
++ for lang in $(linguas); do \
++ d=$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \
++ mkdir -p $$d; \
++- install -m 0755 $$lang.gmo $$d/$(DOMAIN).mo; \
+++ install -m 0755 $(srcdir)/$$lang.gmo $$d/$(DOMAIN).mo; \
++ done
++
++ .PRECIOUS: $(DOMAIN).pot $(POFILES)
diff --combined debian/patches/0011-autoreconf.patch
index 0000000,0000000..b893455
new file mode 100644
--- /dev/null
+++ b/debian/patches/0011-autoreconf.patch
@@@ -1,0 -1,0 +1,9500 @@@
++From: Hilko Bengen <bengen at debian.org>
++Date: Tue, 10 Jan 2012 13:30:43 +0100
++Subject: autoreconf
++
++---
++ Makefile.in | 74 ++++--
++ aclocal.m4 | 25 +-
++ align/Makefile.in | 83 ++++--
++ appliance/Makefile.in | 93 +++++--
++ build-aux/config.guess | 259 ++++++++++---------
++ build-aux/config.sub | 204 ++++++++++-----
++ cat/Makefile.in | 83 ++++--
++ config.h.in | 14 +-
++ configure | 561 +++++++++++++++++++++--------------------
++ csharp/Makefile.in | 61 +++--
++ daemon/Makefile.in | 70 +++--
++ df/Makefile.in | 83 ++++--
++ edit/Makefile.in | 83 ++++--
++ erlang/Makefile.in | 71 ++++--
++ erlang/examples/Makefile.in | 78 ++++--
++ examples/Makefile.in | 95 ++++---
++ fish/Makefile.in | 98 ++++---
++ format/Makefile.in | 83 ++++--
++ fuse/Makefile.in | 83 ++++--
++ generator/Makefile.in | 61 +++--
++ gnulib/lib/Makefile.in | 72 ++++--
++ gnulib/tests/Makefile.in | 72 ++++--
++ gobject/Makefile.in | 101 +++++---
++ gobject/docs/Makefile.in | 61 +++--
++ haskell/Makefile.in | 61 +++--
++ inspector/Makefile.in | 88 +++++--
++ java/Makefile.in | 69 +++--
++ java/examples/Makefile.in | 78 ++++--
++ ocaml/Makefile.in | 61 +++--
++ ocaml/examples/Makefile.in | 78 ++++--
++ perl/Makefile.in | 62 +++--
++ perl/examples/Makefile.in | 78 ++++--
++ php/Makefile.in | 66 +++--
++ po-docs/Makefile.in | 72 ++++--
++ po-docs/ja/Makefile.in | 61 +++--
++ po-docs/uk/Makefile.in | 61 +++--
++ po/Makefile.in | 63 +++--
++ python/Makefile.in | 69 +++--
++ python/examples/Makefile.in | 78 ++++--
++ rescue/Makefile.in | 83 ++++--
++ resize/Makefile.in | 83 ++++--
++ ruby/Makefile.in | 73 ++++--
++ ruby/examples/Makefile.in | 78 ++++--
++ sparsify/Makefile.in | 83 ++++--
++ src/Makefile.in | 91 +++++--
++ sysprep/Makefile.in | 83 ++++--
++ test-tool/Makefile.in | 83 ++++--
++ tests/btrfs/Makefile.in | 61 +++--
++ tests/c-api/Makefile.in | 61 +++--
++ tests/data/Makefile.in | 61 +++--
++ tests/extra/Makefile.in | 61 +++--
++ tests/guests/Makefile.in | 61 +++--
++ tests/luks/Makefile.in | 61 +++--
++ tests/lvm/Makefile.in | 61 +++--
++ tests/md/Makefile.in | 61 +++--
++ tests/ntfsclone/Makefile.in | 61 +++--
++ tests/protocol/Makefile.in | 61 +++--
++ tests/qemu/Makefile.in | 61 +++--
++ tests/regressions/Makefile.in | 61 +++--
++ tests/xml/Makefile.in | 61 +++--
++ tools/Makefile.in | 83 ++++--
++ 61 files changed, 3350 insertions(+), 1796 deletions(-)
++
++diff --git a/Makefile.in b/Makefile.in
++index 04c70d9..3a3fdae 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.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@
++@@ -70,7 +87,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
++ $(srcdir)/podwrapper.sh.in $(srcdir)/run.in \
++ $(top_srcdir)/configure $(top_srcdir)/subdir-rules.mk AUTHORS \
++- COPYING COPYING.LIB TODO build-aux/compile \
+++ 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
++@@ -149,25 +166,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -243,6 +259,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=) \
++@@ -1673,13 +1694,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 5eb56bc..9024271 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.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'.])])
++@@ -48,7 +48,8 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
++ # ----------------------------------
++ 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])
++@@ -94,7 +95,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
++@@ -142,9 +144,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
++@@ -157,7 +159,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])
++@@ -168,7 +170,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
++@@ -646,7 +648,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.5], [],
++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++ ])
++
++@@ -662,7 +664,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.5])dnl
++ m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
++@@ -1750,7 +1752,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 929a48e..b5bdac7 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.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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +258,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/||"`;; \
++@@ -1384,8 +1405,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 +1593,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 784c1d2..b6b2a5e 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.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@
++@@ -116,25 +133,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -231,6 +247,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)
++@@ -1335,8 +1356,11 @@ libguestfs-make-fixed-appliance: $(top_builddir)/config.status $(srcdir)/libgues
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++ install-sbinSCRIPTS: $(sbin_SCRIPTS)
++ @$(NORMAL_INSTALL)
++- test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)"
++ @list='$(sbin_SCRIPTS)'; 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 \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
++@@ -1373,11 +1397,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"; \
++@@ -1409,8 +1440,11 @@ uninstall-man1:
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
++ 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; \
+++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++@@ -1427,8 +1461,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; \
+++ 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..d622a44 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, 2012 Free Software Foundation, Inc.
++
++-timestamp='2009-11-20'
+++timestamp='2012-02-10'
++
++ # 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
++@@ -17,9 +17,7 @@ timestamp='2009-11-20'
++ # General Public License for more details.
++ #
++ # You should have received a copy of the GNU General Public License
++-# along with this program; if not, write to the Free Software
++-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++-# 02110-1301, USA.
+++# along with this program; if not, see <http://www.gnu.org/licenses/>.
++ #
++ # As a special exception to the GNU General Public License, if you
++ # distribute this file as part of a program that contains a
++@@ -56,8 +54,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, 2012
+++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."
++@@ -144,7 +143,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
++ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++ *:NetBSD:*:*)
++ # NetBSD (nbsd) targets should (where applicable) match one or
++- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
++ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
++ # switched to ELF, *-*-netbsd* would select the old
++ # object file format. This provides both forward
++@@ -180,7 +179,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++ fi
++ ;;
++ *)
++- os=netbsd
+++ os=netbsd
++ ;;
++ esac
++ # The OS release
++@@ -223,7 +222,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 +268,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 +297,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 +396,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 +482,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 +496,7 @@ EOF
++ else
++ echo i586-dg-dgux${UNAME_RELEASE}
++ fi
++- exit ;;
+++ exit ;;
++ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
++ echo m88k-dolphin-sysv3
++ exit ;;
++@@ -551,7 +553,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 +596,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 +732,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 +771,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}
++@@ -788,13 +790,12 @@ EOF
++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
++ exit ;;
++ *:FreeBSD:*:*)
++- case ${UNAME_MACHINE} in
++- pc98)
++- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+++ UNAME_PROCESSOR=`/usr/bin/uname -p`
+++ case ${UNAME_PROCESSOR} in
++ amd64)
++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ *)
++- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ esac
++ exit ;;
++ i*:CYGWIN*:*)
++@@ -803,15 +804,18 @@ EOF
++ *:MINGW*:*)
++ echo ${UNAME_MACHINE}-pc-mingw32
++ exit ;;
+++ i*:MSYS*:*)
+++ echo ${UNAME_MACHINE}-pc-msys
+++ 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 ;;
++@@ -857,6 +861,13 @@ EOF
++ i*86:Minix:*:*)
++ echo ${UNAME_MACHINE}-pc-minix
++ exit ;;
+++ aarch64:Linux:*:*)
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+++ exit ;;
+++ aarch64_be:Linux:*:*)
+++ UNAME_MACHINE=aarch64_be
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+++ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++@@ -866,7 +877,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,20 +889,29 @@ 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:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ cris:Linux:*:*)
++- echo cris-axis-linux-gnu
+++ echo ${UNAME_MACHINE}-axis-linux-gnu
++ exit ;;
++ crisv32:Linux:*:*)
++- echo crisv32-axis-linux-gnu
+++ echo ${UNAME_MACHINE}-axis-linux-gnu
++ exit ;;
++ frv:Linux:*:*)
++- echo frv-unknown-linux-gnu
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+++ exit ;;
+++ hexagon:Linux:*:*)
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++@@ -933,7 +953,7 @@ EOF
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++ ;;
++ or32:Linux:*:*)
++- echo or32-unknown-linux-gnu
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ padre:Linux:*:*)
++ echo sparc-unknown-linux-gnu
++@@ -959,7 +979,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,14 +987,17 @@ EOF
++ sparc:Linux:*:* | sparc64:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+++ tile*:Linux:*:*)
+++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+++ exit ;;
++ vax:Linux:*:*)
++ echo ${UNAME_MACHINE}-dec-linux-gnu
++ exit ;;
++ x86_64:Linux:*:*)
++- echo x86_64-unknown-linux-gnu
+++ echo ${UNAME_MACHINE}-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 +1006,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 +1042,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 +1070,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 +1111,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 +1155,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 +1184,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 +1253,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 +1301,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 ;;
++@@ -1299,6 +1325,9 @@ EOF
++ i*86:AROS:*:*)
++ echo ${UNAME_MACHINE}-pc-aros
++ exit ;;
+++ x86_64:VMkernel:*:*)
+++ echo ${UNAME_MACHINE}-unknown-esx
+++ exit ;;
++ esac
++
++ #echo '(No uname command or uname output not recognized.)' 1>&2
++@@ -1321,11 +1350,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..c894da4 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, 2012 Free Software Foundation, Inc.
++
++-timestamp='2009-11-20'
+++timestamp='2012-02-10'
++
++ # This file is (in principle) common to ALL GNU software.
++ # The presence of a machine in this file suggests that SOME GNU software
++@@ -21,9 +21,7 @@ timestamp='2009-11-20'
++ # GNU General Public License for more details.
++ #
++ # You should have received a copy of the GNU General Public License
++-# along with this program; if not, write to the Free Software
++-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
++-# 02110-1301, USA.
+++# along with this program; if not, see <http://www.gnu.org/licenses/>.
++ #
++ # As a special exception to the GNU General Public License, if you
++ # distribute this file as part of a program that contains a
++@@ -75,8 +73,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, 2012
+++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,13 +122,18 @@ 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
++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
++ ;;
+++ android-linux)
+++ os=-linux-android
+++ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+++ ;;
++ *)
++ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
++ if [ $basic_machine != $1 ]
++@@ -156,8 +160,8 @@ case $os in
++ os=
++ basic_machine=$1
++ ;;
++- -bluegene*)
++- os=-cnk
+++ -bluegene*)
+++ os=-cnk
++ ;;
++ -sim | -cisco | -oki | -wec | -winbond)
++ os=
++@@ -173,10 +177,10 @@ case $os in
++ os=-chorusos
++ basic_machine=$1
++ ;;
++- -chorusrdb)
++- os=-chorusrdb
+++ -chorusrdb)
+++ os=-chorusrdb
++ basic_machine=$1
++- ;;
+++ ;;
++ -hiux*)
++ os=-hiuxwe2
++ ;;
++@@ -245,17 +249,22 @@ case $basic_machine in
++ # Some are omitted here because they have special meanings below.
++ 1750a | 580 \
++ | a29k \
+++ | aarch64 | aarch64_be \
++ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
++ | am33_2.0 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+++ | be32 | be64 \
++ | bfin \
++ | c4x | clipper \
++ | d10v | d30v | dlx | dsp16xx \
+++ | epiphany \
++ | fido | fr30 | frv \
++ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+++ | hexagon \
++ | i370 | i860 | i960 | ia64 \
++ | ip2k | iq2000 \
+++ | le32 | le64 \
++ | lm32 \
++ | m32c | m32r | m32rle | m68000 | m68k | m88k \
++ | maxq | mb | microblaze | mcore | mep | metag \
++@@ -281,29 +290,39 @@ 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 \
+++ | rl78 | rx \
++ | score \
++ | 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 \
++- | spu | strongarm \
++- | tahoe | thumb | tic4x | tic80 | tron \
+++ | spu \
+++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
++ | ubicom32 \
++- | v850 | v850e \
+++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
++ | we32k \
++- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+++ | x86 | xc16x | xstormy16 | xtensa \
++ | z8k | z80)
++ basic_machine=$basic_machine-unknown
++ ;;
++- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
++- # Motorola 68HC11/12.
+++ c54x)
+++ basic_machine=tic54x-unknown
+++ ;;
+++ c55x)
+++ basic_machine=tic55x-unknown
+++ ;;
+++ c6x)
+++ basic_machine=tic6x-unknown
+++ ;;
+++ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
++ basic_machine=$basic_machine-unknown
++ os=-none
++ ;;
++@@ -313,6 +332,21 @@ case $basic_machine in
++ basic_machine=mt-unknown
++ ;;
++
+++ strongarm | thumb | xscale)
+++ basic_machine=arm-unknown
+++ ;;
+++ xgate)
+++ basic_machine=$basic_machine-unknown
+++ os=-none
+++ ;;
+++ 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.
++@@ -327,21 +361,25 @@ case $basic_machine in
++ # Recognize the basic CPU types with company name.
++ 580-* \
++ | a29k-* \
+++ | aarch64-* | aarch64_be-* \
++ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
++ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
++ | avr-* | avr32-* \
+++ | be32-* | be64-* \
++ | bfin-* | bs2000-* \
++- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+++ | c[123]* | c30-* | [cjt]90-* | c4x-* \
++ | clipper-* | craynv-* | cydra-* \
++ | d10v-* | d30v-* | dlx-* \
++ | elxsi-* \
++ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
++ | h8300-* | h8500-* \
++ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+++ | hexagon-* \
++ | i*86-* | i860-* | i960-* | ia64-* \
++ | ip2k-* | iq2000-* \
+++ | le32-* | le64-* \
++ | lm32-* \
++ | m32c-* | m32r-* | m32rle-* \
++ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
++@@ -367,25 +405,29 @@ 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-* \
+++ | rl78-* | 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*-* \
++ | tron-* \
++ | ubicom32-* \
++- | v850-* | v850e-* | vax-* \
+++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+++ | vax-* \
++ | we32k-* \
++- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+++ | x86-* | x86_64-* | xc16x-* | xps100-* \
++ | xstormy16-* | xtensa*-* \
++ | ymp-* \
++ | z8k-* | z80-*)
++@@ -410,7 +452,7 @@ case $basic_machine in
++ basic_machine=a29k-amd
++ os=-udi
++ ;;
++- abacus)
+++ abacus)
++ basic_machine=abacus-unknown
++ ;;
++ adobe68k)
++@@ -480,11 +522,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 +567,7 @@ case $basic_machine in
++ basic_machine=craynv-cray
++ os=-unicosmp
++ ;;
++- cr16)
+++ cr16 | cr16-*)
++ basic_machine=cr16-unknown
++ os=-elf
++ ;;
++@@ -674,7 +725,6 @@ case $basic_machine in
++ i370-ibm* | ibm*)
++ basic_machine=i370-ibm
++ ;;
++-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
++ i*86v32)
++ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
++ os=-sysv32
++@@ -732,7 +782,7 @@ case $basic_machine in
++ basic_machine=ns32k-utek
++ os=-sysv
++ ;;
++- microblaze)
+++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
++ mingw32)
++@@ -771,10 +821,18 @@ case $basic_machine in
++ ms1-*)
++ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
++ ;;
+++ msys)
+++ basic_machine=i386-pc
+++ os=-msys
+++ ;;
++ mvs)
++ basic_machine=i370-ibm
++ os=-mvs
++ ;;
+++ nacl)
+++ basic_machine=le32-unknown
+++ os=-nacl
+++ ;;
++ ncr3000)
++ basic_machine=i486-ncr
++ os=-sysv4
++@@ -839,6 +897,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 +985,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 +1082,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,20 +1141,8 @@ 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
++- ;;
++ tile*)
++- basic_machine=tile-unknown
+++ basic_machine=$basic_machine-unknown
++ os=-linux-gnu
++ ;;
++ tx39)
++@@ -1156,6 +1212,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 +1312,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|'`
++@@ -1293,8 +1352,9 @@ case $os in
++ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
++ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++ | -chorusos* | -chorusrdb* | -cegcc* \
++- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+++ | -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 +1401,7 @@ case $os in
++ -opened*)
++ os=-openedition
++ ;;
++- -os400*)
+++ -os400*)
++ os=-os400
++ ;;
++ -wince*)
++@@ -1390,7 +1450,7 @@ case $os in
++ -sinix*)
++ os=-sysv4
++ ;;
++- -tpf*)
+++ -tpf*)
++ os=-tpf
++ ;;
++ -triton*)
++@@ -1435,6 +1495,8 @@ case $os in
++ -dicos*)
++ os=-dicos
++ ;;
+++ -nacl*)
+++ ;;
++ -none)
++ ;;
++ *)
++@@ -1457,10 +1519,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 +1534,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-*)
++@@ -1493,14 +1564,11 @@ case $basic_machine in
++ ;;
++ m68000-sun)
++ os=-sunos3
++- # This also exists in the configure program, but was not the
++- # default.
++- # os=-sunos4
++ ;;
++ m68*-cisco)
++ os=-aout
++ ;;
++- mep-*)
+++ mep-*)
++ os=-elf
++ ;;
++ mips*-cisco)
++@@ -1527,7 +1595,7 @@ case $basic_machine in
++ *-ibm)
++ os=-aix
++ ;;
++- *-knuth)
+++ *-knuth)
++ os=-mmixware
++ ;;
++ *-wec)
++diff --git a/cat/Makefile.in b/cat/Makefile.in
++index 4b5f96e..d38c924 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.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@
++@@ -116,25 +133,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -263,6 +279,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/||"`;; \
++@@ -1455,8 +1476,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; \
++@@ -1811,11 +1835,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 8897e70..a244b91 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
++@@ -2086,9 +2086,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
++@@ -2200,7 +2200,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 eefe695..d8e6a31 100755
++--- a/configure
+++++ b/configure
++@@ -1,11 +1,9 @@
++ #! /bin/sh
++ # Guess values for system-dependent variables and create Makefiles.
++-# Generated by GNU Autoconf 2.68 for libguestfs 1.18.0.
+++# Generated by GNU Autoconf 2.69 for libguestfs 1.18.0.
++ #
++ #
++-# 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'"
++@@ -2285,8 +2305,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
++@@ -2638,9 +2656,9 @@ test -n "$ac_init_help" && exit $ac_status
++ if $ac_init_version; then
++ cat <<\_ACEOF
++ libguestfs configure 1.18.0
++-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
++@@ -2913,7 +2931,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
++@@ -3173,7 +3191,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;
++@@ -3189,7 +3208,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;
++@@ -3215,7 +3235,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;
++@@ -3231,7 +3252,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;
++@@ -3265,7 +3287,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;
++@@ -3436,7 +3459,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
++@@ -3501,7 +3524,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.18.0, which was
++-generated by GNU Autoconf 2.68. Invocation command line was
+++generated by GNU Autoconf 2.69. Invocation command line was
++
++ $ $0 $@
++
++@@ -3998,7 +4021,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.
++@@ -4167,7 +4190,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
++@@ -4207,7 +4230,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
++@@ -4258,7 +4281,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) '* | \
++@@ -4312,7 +4335,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
++@@ -4625,7 +4648,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
++@@ -4665,7 +4688,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
++@@ -4718,7 +4741,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
++@@ -4759,7 +4782,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
++@@ -4817,7 +4840,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
++@@ -4861,7 +4884,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
++@@ -5307,8 +5330,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);
++@@ -5676,7 +5698,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
++@@ -5742,7 +5764,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
++@@ -5842,7 +5864,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
++@@ -5882,7 +5904,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
++@@ -5949,7 +5971,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
++@@ -5989,7 +6011,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
++@@ -6544,9 +6566,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.
++@@ -6555,8 +6577,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 ()
++ {
++@@ -6565,16 +6587,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
++@@ -6601,8 +6623,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 ()
++ {
++@@ -6625,8 +6647,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 ()
++ {
++@@ -6670,8 +6692,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 ()
++ {
++@@ -6694,8 +6716,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 ()
++ {
++@@ -6878,7 +6900,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 :
++@@ -6918,8 +6940,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);
++@@ -8284,8 +8305,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
++@@ -37208,7 +37229,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
++@@ -37287,7 +37308,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
++@@ -37543,7 +37564,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
++@@ -37587,7 +37608,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
++@@ -38011,7 +38032,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
++@@ -38051,7 +38072,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
++@@ -38357,7 +38378,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
++@@ -38397,7 +38418,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
++@@ -38500,7 +38521,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
++@@ -38544,7 +38565,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
++@@ -38669,7 +38690,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
++@@ -38709,7 +38730,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
++@@ -38768,7 +38789,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
++@@ -38808,7 +38829,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
++@@ -39457,7 +39478,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
++@@ -39497,7 +39518,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
++@@ -39577,7 +39598,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
++@@ -39617,7 +39638,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
++@@ -39669,7 +39690,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
++@@ -39709,7 +39730,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
++@@ -39761,7 +39782,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
++@@ -39801,7 +39822,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
++@@ -39853,7 +39874,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
++@@ -39893,7 +39914,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
++@@ -39945,7 +39966,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
++@@ -39985,7 +40006,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
++@@ -44232,7 +44253,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
++@@ -44430,7 +44451,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 :
++@@ -44470,8 +44491,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);
++@@ -45210,9 +45230,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.
++@@ -45221,8 +45241,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 ()
++ {
++@@ -45231,16 +45251,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
++@@ -45267,8 +45287,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 ()
++ {
++@@ -45291,8 +45311,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 ()
++ {
++@@ -45336,8 +45356,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 ()
++ {
++@@ -45360,8 +45380,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 ()
++ {
++@@ -45911,7 +45931,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_XGETTEXT="xgettext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++@@ -45949,7 +45969,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_MSGCAT="msgcat"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++@@ -45987,7 +46007,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_MSGFMT="msgfmt"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++@@ -46025,7 +46045,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_MSGMERGE="msgmerge"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++@@ -46194,7 +46214,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
++@@ -46270,7 +46290,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
++@@ -46411,6 +46431,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.
++@@ -46431,7 +46452,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
++@@ -46474,7 +46495,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
++@@ -46539,6 +46560,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
++@@ -46555,6 +46577,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
++@@ -46574,9 +46597,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
++@@ -46745,7 +46768,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
++@@ -46786,7 +46809,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
++@@ -46827,7 +46850,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
++@@ -46867,7 +46890,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
++@@ -46907,7 +46930,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
++@@ -46978,7 +47001,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
++@@ -47022,7 +47045,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
++@@ -47069,7 +47092,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
++@@ -47118,7 +47141,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
++@@ -47161,7 +47184,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
++@@ -47219,7 +47242,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
++@@ -47262,7 +47285,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
++@@ -47305,7 +47328,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
++@@ -47348,7 +47371,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
++@@ -47420,7 +47443,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
++@@ -47482,7 +47505,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
++@@ -47758,6 +47781,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
++@@ -47774,6 +47798,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
++@@ -47793,9 +47818,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
++@@ -47810,7 +47835,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; }
++@@ -47826,7 +47850,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
++@@ -47905,6 +47928,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
++@@ -47921,6 +47945,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
++@@ -47940,9 +47965,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
++@@ -47990,6 +48015,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
++@@ -48006,6 +48032,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
++@@ -48025,9 +48052,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
++@@ -48075,6 +48102,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
++@@ -48091,6 +48119,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
++@@ -48110,9 +48139,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
++@@ -48160,6 +48189,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
++@@ -48176,6 +48206,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
++@@ -48195,9 +48226,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
++@@ -48253,6 +48284,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
++@@ -48269,6 +48301,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
++@@ -48288,9 +48321,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
++@@ -48356,7 +48389,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_CXX="$ac_tool_prefix$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++@@ -48400,7 +48433,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_CXX="$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++@@ -51942,7 +51975,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
++@@ -52011,7 +52044,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
++@@ -52051,7 +52084,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
++@@ -52116,7 +52149,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
++@@ -52156,7 +52189,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
++@@ -52226,7 +52259,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
++@@ -52266,7 +52299,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
++@@ -52330,7 +52363,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
++@@ -52370,7 +52403,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
++@@ -52439,7 +52472,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
++@@ -52479,7 +52512,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
++@@ -52533,7 +52566,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
++@@ -52573,7 +52606,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
++@@ -52627,7 +52660,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
++@@ -52667,7 +52700,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
++@@ -52721,7 +52754,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
++@@ -52761,7 +52794,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
++@@ -52815,7 +52848,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
++@@ -52855,7 +52888,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
++@@ -52910,7 +52943,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
++@@ -52950,7 +52983,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
++@@ -53035,7 +53068,7 @@ $as_echo "not found" >&6; }
++
++
++ for program in resize sparsify sysprep; do
++- output=$program/${program}_gettext.ml
+++ output=$builddir/$program/${program}_gettext.ml
++ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $output" >&5
++ $as_echo "$as_me: creating $output" >&6;}
++ rm -f $output
++@@ -53136,7 +53169,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_OCAML_GETTEXT="ocaml-gettext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++@@ -53194,7 +53227,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
++@@ -53275,7 +53308,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
++@@ -53478,7 +53511,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
++@@ -53516,7 +53549,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
++@@ -53798,7 +53831,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
++@@ -53858,7 +53891,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
++@@ -53896,7 +53929,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
++@@ -53965,7 +53998,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
++@@ -54008,7 +54041,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
++@@ -54073,7 +54106,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
++@@ -54116,7 +54149,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
++@@ -54261,7 +54294,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
++@@ -54304,7 +54337,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
++@@ -54371,7 +54404,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
++@@ -54414,7 +54447,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
++@@ -54573,6 +54606,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
++@@ -54589,6 +54623,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
++@@ -54608,9 +54643,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
++@@ -54653,6 +54688,7 @@ if test -n "$GIO_CFLAGS"; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.26.0" 2>/dev/null`
+++ test "x$?" != "x0" && pkg_failed=yes
++ else
++ pkg_failed=yes
++ fi
++@@ -54669,6 +54705,7 @@ if test -n "$GIO_LIBS"; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.26.0" 2>/dev/null`
+++ test "x$?" != "x0" && pkg_failed=yes
++ else
++ pkg_failed=yes
++ fi
++@@ -54688,9 +54725,9 @@ else
++ _pkg_short_errors_supported=no
++ fi
++ if test $_pkg_short_errors_supported = yes; then
++- GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= 2.26.0" 2>&1`
+++ GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.26.0" 2>&1`
++ else
++- GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= 2.26.0" 2>&1`
+++ GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.26.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GIO_PKG_ERRORS" >&5
++@@ -54745,7 +54782,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
++@@ -54901,7 +54938,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_GTKDOC_CHECK="$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
++@@ -54943,7 +54980,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_GTKDOC_REBASE="$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
++@@ -54987,7 +55024,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_GTKDOC_MKPDF="$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
++@@ -55056,6 +55093,7 @@ if test -n "$GTKDOC_DEPS_CFLAGS"; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GTKDOC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null`
+++ test "x$?" != "x0" && pkg_failed=yes
++ else
++ pkg_failed=yes
++ fi
++@@ -55072,6 +55110,7 @@ if test -n "$GTKDOC_DEPS_LIBS"; then
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_GTKDOC_DEPS_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>/dev/null`
+++ test "x$?" != "x0" && pkg_failed=yes
++ else
++ pkg_failed=yes
++ fi
++@@ -55091,9 +55130,9 @@ else
++ _pkg_short_errors_supported=no
++ fi
++ if test $_pkg_short_errors_supported = yes; then
++- GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
+++ GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
++ else
++- GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
+++ GTKDOC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
++@@ -55108,7 +55147,6 @@ installed software in a non-standard prefix.
++ Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
++ and GTKDOC_DEPS_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; }
++@@ -55124,7 +55162,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
++ GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
++ GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
++@@ -55875,16 +55912,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
++@@ -55944,28 +55981,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'"
++@@ -55987,7 +56012,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++ # values after options handling.
++ ac_log="
++ This file was extended by libguestfs $as_me 1.18.0, 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
++@@ -56057,10 +56082,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.18.0
++-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."
++
++@@ -56151,7 +56176,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'
++diff --git a/csharp/Makefile.in b/csharp/Makefile.in
++index 94a9ede..84a47d0 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.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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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
++ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ pkglibexecdir = @pkglibexecdir@
++ ACLOCAL = @ACLOCAL@
++diff --git a/daemon/Makefile.in b/daemon/Makefile.in
++index 8597c4c..b6b76f1 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.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@
++@@ -116,25 +133,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -295,6 +311,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)
++@@ -1520,8 +1541,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; \
++@@ -3077,10 +3101,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 0c4fa3d..bfd5d57 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.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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -239,6 +255,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/||"`;; \
++@@ -1395,8 +1416,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; \
++@@ -1610,11 +1634,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 2d1d3a7..088a93d 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.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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +252,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/||"`;; \
++@@ -1384,8 +1405,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; \
++@@ -1554,11 +1578,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 0cd305a..ef97c23 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.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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +253,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/||"`;; \
++@@ -1361,8 +1382,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; \
++@@ -1471,8 +1495,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; \
+++ 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 48f79de..1039920 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.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@
++@@ -95,25 +112,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +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/||"`;; \
++@@ -1295,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/examples/Makefile.in b/examples/Makefile.in
++index 48c79c3..6e979c7 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.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@
++@@ -102,25 +119,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -267,6 +283,11 @@ DIST_SOURCES = $(am__copy_over_SOURCES_DIST) $(create_disk_SOURCES) \
++ $(display_icon_SOURCES) $(inspect_vm_SOURCES) \
++ $(am__mount_local_SOURCES_DIST) \
++ $(am__virt_dhcp_address_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/||"`;; \
++@@ -1612,11 +1633,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"; \
++@@ -1648,11 +1676,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 4fbf987..33545d4 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.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@
++@@ -129,25 +146,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -313,6 +329,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)
++@@ -1546,8 +1567,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; \
++@@ -1592,8 +1616,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; \
++@@ -2214,11 +2241,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"; \
++@@ -2250,8 +2284,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; \
+++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++@@ -2268,8 +2305,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; \
+++ 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 0d7cc5a..7df6e73 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.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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +253,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/||"`;; \
++@@ -1384,8 +1405,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; \
++@@ -1554,11 +1578,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 c7142c0..0897acd 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.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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +260,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/||"`;; \
++@@ -1393,8 +1414,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; \
++@@ -1563,11 +1587,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 7d17195..ec9fc2e 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.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@
++@@ -95,25 +112,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +195,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 bb39cbb..5989cb4 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.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@
++@@ -104,25 +121,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -240,6 +256,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
++@@ -1872,13 +1893,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 b1ae3ef..b7daffa 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.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@
++@@ -246,25 +263,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -1159,6 +1175,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
++@@ -3445,13 +3466,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 7125594..cef5a3d 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.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@
++@@ -94,7 +111,8 @@ DIST_COMMON = $(libguestfs_gobject_1_0_la_HEADERS) \
++ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++ $(srcdir)/Makefile.inc $(top_srcdir)/subdir-rules.mk
++ @HAVE_INTROSPECTION_TRUE at am__append_1 = Guestfs-1.0.gir
++- at HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA)
+++ at ENABLE_APPLIANCE_TRUE@@HAVE_INTROSPECTION_TRUE at am__append_2 = run-live-tests
+++ at HAVE_INTROSPECTION_TRUE@am__append_3 = $(gir_DATA) $(typelib_DATA)
++ subdir = gobject
++ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++@@ -139,25 +157,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -334,6 +351,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
++ DATA = $(gir_DATA) $(typelib_DATA)
++ HEADERS = $(libguestfs_gobject_1_0_la_HEADERS)
++ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++@@ -1508,7 +1530,7 @@ EXTRA_DIST = \
++
++ # Remove the old generated files which were directly in the gobject/
++ # directory. These have now moved into gobject/src/
++-CLEANFILES = guestfs-gobject*.c *.o *.lo $(am__append_2)
+++CLEANFILES = guestfs-gobject*.c *.o *.lo $(am__append_3)
++ libname = libguestfs-gobject-1.0.la
++ lib_LTLIBRARIES = $(libname)
++ libguestfs_gobject_1_0_ladir = $(includedir)/guestfs-gobject
++@@ -1530,12 +1552,12 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
++ @HAVE_INTROSPECTION_TRUE at Guestfs_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
++ @HAVE_INTROSPECTION_TRUE at Guestfs_1_0_gir_CFLAGS = $(INCLUDES) -I$(srcdir)/include
++ @HAVE_INTROSPECTION_TRUE at Guestfs_1_0_gir_LIBS = $(libname)
++- at HAVE_INTROSPECTION_TRUE@Guestfs_1_0_gir_FILES = $(introspection_sources)
+++ at HAVE_INTROSPECTION_TRUE@Guestfs_1_0_gir_FILES = $(patsubst %,$(srcdir)/%,$(introspection_sources))
++ @HAVE_INTROSPECTION_TRUE at girdir = $(datadir)/gir-1.0
++ @HAVE_INTROSPECTION_TRUE at gir_DATA = $(INTROSPECTION_GIRS)
++ @HAVE_INTROSPECTION_TRUE at typelibdir = $(libdir)/girepository-1.0
++ @HAVE_INTROSPECTION_TRUE at typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
++- at HAVE_INTROSPECTION_TRUE@TESTS = run-tests
+++ at HAVE_INTROSPECTION_TRUE@TESTS = run-tests $(am__append_2)
++ @HAVE_INTROSPECTION_TRUE at TESTS_ENVIRONMENT = GJS=$(GJS)
++ all: $(BUILT_SOURCES)
++ $(MAKE) $(AM_MAKEFLAGS) all-recursive
++@@ -1575,7 +1597,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 \
++@@ -1583,6 +1604,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++ else :; fi; \
++ done; \
++ test -z "$$list2" || { \
+++ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+++ $(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)"; \
++ }
++@@ -1970,8 +1993,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; \
+++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++@@ -1988,8 +2014,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; \
+++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++@@ -2006,8 +2035,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; \
+++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++@@ -2283,13 +2315,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; \
++@@ -2479,7 +2508,7 @@ appliance: force
++ # in the subdirectory.
++ install-data-hook:
++ rm $(DESTDIR)$(includedir)/guestfs-gobject/guestfs-gobject.h
++- install -m 0644 include/guestfs-gobject.h $(DESTDIR)$(includedir)
+++ install -m 0644 $(srcdir)/include/guestfs-gobject.h $(DESTDIR)$(includedir)
++
++ -include $(INTROSPECTION_MAKEFILE)
++
++diff --git a/gobject/docs/Makefile.in b/gobject/docs/Makefile.in
++index 2346b76..b0f2059 100644
++--- a/gobject/docs/Makefile.in
+++++ b/gobject/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.5 from Makefile.am.
++ # @configure_input@
++
++ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++@@ -38,6 +38,23 @@
++ # Everything below here is generic #
++ ####################################
++ 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@
++@@ -101,25 +118,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -186,6 +202,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/haskell/Makefile.in b/haskell/Makefile.in
++index 5ebaeb5..544e929 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.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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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)
++diff --git a/inspector/Makefile.in b/inspector/Makefile.in
++index d144251..f0e8261 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.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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -247,6 +263,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/||"`;; \
++@@ -1409,8 +1430,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; \
++@@ -1579,11 +1603,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"; \
++@@ -1615,8 +1646,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; \
+++ 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 9c40363..4cc746c 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.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@
++@@ -137,25 +154,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -288,6 +304,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
++@@ -1443,7 +1464,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 \
++@@ -1451,6 +1471,8 @@ install-jnilibLTLIBRARIES: $(jnilib_LTLIBRARIES)
++ else :; fi; \
++ done; \
++ test -z "$$list2" || { \
+++ echo " $(MKDIR_P) '$(DESTDIR)$(jnilibdir)'"; \
+++ $(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)"; \
++ }
++@@ -1518,8 +1540,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; \
+++ 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 f5774d4..87befb8 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.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@
++@@ -96,25 +113,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -182,6 +198,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/||"`;; \
++@@ -1301,11 +1322,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 256f960..b48a125 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.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@
++@@ -122,25 +139,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -248,6 +264,11 @@ am__v_GEN_0 = @echo " GEN " $@;
++ SOURCES = $(libguestfsocaml_a_SOURCES) $(libocamltestlib_a_SOURCES)
++ DIST_SOURCES = $(am__libguestfsocaml_a_SOURCES_DIST) \
++ $(am__libocamltestlib_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 53f149a..d52c58b 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.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@
++@@ -96,25 +113,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -182,6 +198,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/||"`;; \
++@@ -1302,11 +1323,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 ca4efc3..ba6d188 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.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@
++@@ -114,25 +131,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -199,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)
++@@ -1586,6 +1607,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 a5f404b..60e2967 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.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@
++@@ -95,25 +112,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +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/||"`;; \
++@@ -1295,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/php/Makefile.in b/php/Makefile.in
++index 58e2b50..9f82f35 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.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@
++@@ -113,25 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +214,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/||"`;; \
++@@ -1319,8 +1340,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; \
+++ 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 0eaf1a6..17487e3 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.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@
++@@ -98,25 +115,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -190,6 +206,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=) \
++@@ -1478,13 +1499,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 4a1af8a..1fe76a6 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.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@
++@@ -98,25 +115,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -183,6 +199,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 971cfe4..e3c1bfa 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.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@
++@@ -98,25 +115,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -183,6 +199,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/Makefile.in b/po/Makefile.in
++index 64c4b63..6030363 100644
++--- a/po/Makefile.in
+++++ b/po/Makefile.in
++@@ -1,4 +1,4 @@
++-# Makefile.in generated by automake 1.11.3 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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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
++ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ pkglibexecdir = @pkglibexecdir@
++ ACLOCAL = @ACLOCAL@
++@@ -1525,7 +1546,7 @@ appliance: force
++ @HAVE_GNU_GETTEXT_TRUE@ for lang in $(linguas); do \
++ @HAVE_GNU_GETTEXT_TRUE@ d=$(DESTDIR)$(langinstdir)/$$lang/LC_MESSAGES; \
++ @HAVE_GNU_GETTEXT_TRUE@ mkdir -p $$d; \
++- at HAVE_GNU_GETTEXT_TRUE@ install -m 0755 $$lang.gmo $$d/$(DOMAIN).mo; \
+++ at HAVE_GNU_GETTEXT_TRUE@ install -m 0755 $(srcdir)/$$lang.gmo $$d/$(DOMAIN).mo; \
++ @HAVE_GNU_GETTEXT_TRUE@ done
++
++ @HAVE_GNU_GETTEXT_TRUE at .PRECIOUS: $(DOMAIN).pot $(POFILES)
++diff --git a/python/Makefile.in b/python/Makefile.in
++index aaf2e96..389539b 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.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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -265,6 +281,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
++@@ -1365,7 +1386,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 \
++@@ -1373,6 +1393,8 @@ install-pythonLTLIBRARIES: $(python_LTLIBRARIES)
++ else :; fi; \
++ done; \
++ test -z "$$list2" || { \
+++ echo " $(MKDIR_P) '$(DESTDIR)$(pythondir)'"; \
+++ $(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)"; \
++ }
++@@ -1448,8 +1470,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; \
+++ 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 b03de9c..b4f8b63 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.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@
++@@ -95,25 +112,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +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/||"`;; \
++@@ -1295,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/rescue/Makefile.in b/rescue/Makefile.in
++index 45cfbc8..56f6751 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.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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +253,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/||"`;; \
++@@ -1374,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; \
++@@ -1544,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/resize/Makefile.in b/resize/Makefile.in
++index f05b922..c658175 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.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@
++@@ -117,25 +134,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +246,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)
++@@ -1361,8 +1382,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; \
++@@ -1399,11 +1423,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 d3af290..a38ea58 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.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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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)
++@@ -1262,8 +1283,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:
++@@ -1580,10 +1601,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 fa5a1b6..d26b617 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.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@
++@@ -95,25 +112,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +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/||"`;; \
++@@ -1295,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/sparsify/Makefile.in b/sparsify/Makefile.in
++index 2faed2d..0b95234 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.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@
++@@ -116,25 +133,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +245,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)
++@@ -1358,8 +1379,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; \
++@@ -1396,11 +1420,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 5c31073..a9e59b0 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.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@
++@@ -120,25 +137,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -302,6 +318,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)
++@@ -1524,7 +1545,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 \
++@@ -1532,6 +1552,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
++ else :; fi; \
++ done; \
++ test -z "$$list2" || { \
+++ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+++ $(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)"; \
++ }
++@@ -1788,11 +1810,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"; \
++@@ -1824,8 +1853,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"; \
++@@ -1842,8 +1874,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; \
+++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++diff --git a/sysprep/Makefile.in b/sysprep/Makefile.in
++index 2659c46..c7a31e3 100644
++--- a/sysprep/Makefile.in
+++++ b/sysprep/Makefile.in
++@@ -1,4 +1,4 @@
++-# Makefile.in generated by automake 1.11.3 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@
++@@ -115,25 +132,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -228,6 +244,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)
++@@ -1414,8 +1435,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; \
++@@ -1452,11 +1476,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/test-tool/Makefile.in b/test-tool/Makefile.in
++index 8a971db..5300573 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.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@
++@@ -114,25 +131,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -232,6 +248,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/||"`;; \
++@@ -1347,8 +1368,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; \
++@@ -1442,11 +1466,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/btrfs/Makefile.in b/tests/btrfs/Makefile.in
++index 680233d..861bb91 100644
++--- a/tests/btrfs/Makefile.in
+++++ b/tests/btrfs/Makefile.in
++@@ -1,4 +1,4 @@
++-# Makefile.in generated by automake 1.11.3 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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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)
++diff --git a/tests/c-api/Makefile.in b/tests/c-api/Makefile.in
++index 73a6c12..4eebfe1 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.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@
++@@ -125,25 +142,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -344,6 +360,11 @@ DIST_SOURCES = $(test_add_drive_opts_SOURCES) $(test_command_SOURCES) \
++ $(am__test_just_header_cxx_SOURCES_DIST) \
++ $(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 d5dd3e7..eb4a742 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.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@
++@@ -113,25 +130,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +214,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 8d3dbdd..1fcbeb6 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.5 from Makefile.am.
++ # @configure_input@
++
++ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++@@ -65,6 +65,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@
++@@ -127,25 +144,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +228,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 65b06b1..f3322c3 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.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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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
++ 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 314eada..aab92ae 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.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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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)
++diff --git a/tests/lvm/Makefile.in b/tests/lvm/Makefile.in
++index cae9e6a..6914524 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.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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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)
++diff --git a/tests/md/Makefile.in b/tests/md/Makefile.in
++index aa70c77..7c49e18 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.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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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)
++diff --git a/tests/ntfsclone/Makefile.in b/tests/ntfsclone/Makefile.in
++index 000444b..4c868b4 100644
++--- a/tests/ntfsclone/Makefile.in
+++++ b/tests/ntfsclone/Makefile.in
++@@ -1,4 +1,4 @@
++-# Makefile.in generated by automake 1.11.3 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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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)
++diff --git a/tests/protocol/Makefile.in b/tests/protocol/Makefile.in
++index 5bc209c..9b91249 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.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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -197,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)
++diff --git a/tests/qemu/Makefile.in b/tests/qemu/Makefile.in
++index 2d94256..df108c5 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.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@
++@@ -116,25 +133,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -201,6 +217,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 531e1b5..3261f88 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.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@
++@@ -117,25 +134,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +253,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/tests/xml/Makefile.in b/tests/xml/Makefile.in
++index 2321fbc..93c3b9d 100644
++--- a/tests/xml/Makefile.in
+++++ b/tests/xml/Makefile.in
++@@ -1,4 +1,4 @@
++-# Makefile.in generated by automake 1.11.3 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,25 +129,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 +246,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
++ am__v_GEN_0 = @echo " GEN " $@;
++ SOURCES = $(libfakevirtxml_la_SOURCES)
++ DIST_SOURCES = $(am__libfakevirtxml_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
++ ETAGS = etags
++ CTAGS = ctags
++ am__tty_colors = \
++diff --git a/tools/Makefile.in b/tools/Makefile.in
++index 2858d4e..a66eb4b 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.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,25 +131,24 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
++ $(top_srcdir)/m4/intmax_t.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/ioctl.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 \
++@@ -228,6 +244,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)
++@@ -1335,8 +1356,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; \
++@@ -1373,11 +1397,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 --combined debian/patches/series
index ca2e2b6,0000000..ad55bbb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,0 +1,11 @@@
+0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
+0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
- 0003-configure.ac-do-not-generate-debian-changelog.patch
- 0004-Fix-for-systemd-based-Debian-systems.patch
- 0005-out-of-tree-build-fix-building-Perl-bindings.patch
- 0006-out-of-tree-build-daemon.patch
- 0007-ruby-install-to-vendor_ruby.patch
- 0008-autoreconf.patch
++0003-Fix-for-systemd-based-Debian-systems.patch
++0004-out-of-tree-build-fix-building-Perl-bindings.patch
++0005-out-of-tree-build-daemon.patch
++0006-ruby-install-to-vendor_ruby.patch
++0007-Fix-out-of-tree-build-for-GObject-bindings.patch
++0008-Split-off-GObject-tests-that-require-an-appliance.patch
++0009-Fix-generation-of-gettext-stubs-for-out-of-tree-buil.patch
++0010-Fix-out-of-tree-build-install-target-for-translation.patch
++0011-autoreconf.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list