[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:58 UTC 2013
The following commit has been merged in the master branch:
commit f66394b05ed63d1ccd3472b74b045f536e829316
Author: Hilko Bengen <bengen at debian.org>
Date: Thu Jul 19 23:13:37 2012 +0200
Use dh-autoreconf
diff --git a/debian/control b/debian/control
index 54e33b2..53f7b2c 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ 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 (>= 9~), autotools-dev, aptitude,
+ dh-autoreconf,
po-debconf, bash-completion,
febootstrap (>= 3.2),
libreadline-dev, libaugeas-dev, libselinux1-dev, libhivex-dev, libvirt-dev,
diff --git a/debian/patches/0009-autoreconf.patch b/debian/patches/0009-autoreconf.patch
deleted file mode 100644
index adc5ea9..0000000
--- a/debian/patches/0009-autoreconf.patch
+++ /dev/null
@@ -1,5980 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Tue, 10 Jan 2012 13:30:43 +0100
-Subject: autoreconf
-
----
- Makefile.in | 39 ++-
- aclocal.m4 | 24 +-
- align/Makefile.in | 46 +++-
- appliance/Makefile.in | 60 ++++-
- cat/Makefile.in | 46 +++-
- config.h.in | 14 +-
- configure | 559 +++++++++++++++++++++--------------------
- csharp/Makefile.in | 24 +-
- daemon/Makefile.in | 33 ++-
- df/Makefile.in | 46 +++-
- edit/Makefile.in | 46 +++-
- erlang/Makefile.in | 34 ++-
- erlang/examples/Makefile.in | 41 ++-
- examples/Makefile.in | 58 ++++-
- fish/Makefile.in | 61 ++++-
- format/Makefile.in | 46 +++-
- fuse/Makefile.in | 46 +++-
- generator/Makefile.in | 24 +-
- gnulib/lib/Makefile.in | 35 ++-
- gnulib/tests/Makefile.in | 35 ++-
- gobject/Makefile.in | 53 +++-
- gobject/docs/Makefile.in | 24 +-
- haskell/Makefile.in | 24 +-
- inspector/Makefile.in | 51 +++-
- java/Makefile.in | 32 ++-
- java/examples/Makefile.in | 41 ++-
- ocaml/Makefile.in | 24 +-
- ocaml/examples/Makefile.in | 41 ++-
- perl/Makefile.in | 25 +-
- perl/examples/Makefile.in | 41 ++-
- php/Makefile.in | 29 ++-
- po-docs/Makefile.in | 35 ++-
- po-docs/ja/Makefile.in | 24 +-
- po-docs/uk/Makefile.in | 24 +-
- po/Makefile.in | 24 +-
- python/Makefile.in | 32 ++-
- python/examples/Makefile.in | 41 ++-
- rescue/Makefile.in | 46 +++-
- resize/Makefile.in | 46 +++-
- ruby/Makefile.in | 36 ++-
- ruby/examples/Makefile.in | 41 ++-
- sparsify/Makefile.in | 46 +++-
- src/Makefile.in | 57 ++++-
- sysprep/Makefile.in | 46 +++-
- test-tool/Makefile.in | 46 +++-
- tests/btrfs/Makefile.in | 24 +-
- tests/c-api/Makefile.in | 24 +-
- tests/charsets/Makefile.in | 24 +-
- tests/data/Makefile.in | 24 +-
- tests/extra/Makefile.in | 24 +-
- tests/guests/Makefile.in | 24 +-
- tests/luks/Makefile.in | 24 +-
- tests/lvm/Makefile.in | 24 +-
- tests/md/Makefile.in | 24 +-
- tests/ntfsclone/Makefile.in | 24 +-
- tests/protocol/Makefile.in | 24 +-
- tests/qemu/Makefile.in | 24 +-
- tests/regressions/Makefile.in | 24 +-
- tests/xml/Makefile.in | 24 +-
- tools/Makefile.in | 46 +++-
- 60 files changed, 2082 insertions(+), 546 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index ce2b84a..d38d93a 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.6 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
-@@ -245,6 +262,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=) \
-@@ -1681,13 +1703,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; \
-@@ -1776,7 +1795,7 @@ distcheck: dist
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
-- chmod -R a-w $(distdir); chmod a+w $(distdir)
-+ chmod -R a-w $(distdir); chmod u+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
-diff --git a/aclocal.m4 b/aclocal.m4
-index c60ee35..c91aa7d 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.6 -*- 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.6], [],
- [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.6])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-diff --git a/align/Makefile.in b/align/Makefile.in
-index 16eea02..d921aea 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.6 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@
-@@ -243,6 +260,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/||"`;; \
-@@ -1391,8 +1413,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; \
-@@ -1576,11 +1601,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 a31077b..29d5a62 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.6 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@
-@@ -232,6 +249,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)
-@@ -1284,8 +1306,8 @@ EXTRA_DIST = \
- make.sh.in \
- packagelist.in
-
--fsdir = $(libdir)/guestfs
--superminfsdir = $(libdir)/guestfs/supermin.d
-+fsdir = $(prefix)/lib/guestfs
-+superminfsdir = $(prefix)/lib/guestfs/supermin.d
- fs_DATA =
- superminfs_DATA = \
- supermin.d/base.img \
-@@ -1342,8 +1364,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; \
-@@ -1380,11 +1405,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"; \
-@@ -1416,8 +1448,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"; \
-@@ -1434,8 +1469,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/cat/Makefile.in b/cat/Makefile.in
-index 45c869b..43d6ff9 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.6 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@
-@@ -264,6 +281,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/||"`;; \
-@@ -1462,8 +1484,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; \
-@@ -1818,11 +1843,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 7767500..1a994d3 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
-@@ -2118,9 +2118,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
-@@ -2232,7 +2232,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 cd10cad..2b71a19 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.5.
-+# Generated by GNU Autoconf 2.69 for libguestfs 1.18.5.
- #
- #
--# 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'"
-@@ -2291,8 +2311,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
-@@ -2644,9 +2662,9 @@ test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
- libguestfs configure 1.18.5
--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
-@@ -2919,7 +2937,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
-@@ -3179,7 +3197,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;
-@@ -3195,7 +3214,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;
-@@ -3221,7 +3241,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;
-@@ -3237,7 +3258,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;
-@@ -3271,7 +3293,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;
-@@ -3442,7 +3465,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
-@@ -3507,7 +3530,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.5, which was
--generated by GNU Autoconf 2.68. Invocation command line was
-+generated by GNU Autoconf 2.69. Invocation command line was
-
- $ $0 $@
-
-@@ -4004,7 +4027,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.
-@@ -4173,7 +4196,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
-@@ -4213,7 +4236,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
-@@ -4264,7 +4287,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) '* | \
-@@ -4318,7 +4341,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
-@@ -4631,7 +4654,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
-@@ -4671,7 +4694,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
-@@ -4724,7 +4747,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
-@@ -4765,7 +4788,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
-@@ -4823,7 +4846,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
-@@ -4867,7 +4890,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
-@@ -5313,8 +5336,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);
-@@ -5682,7 +5704,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
-@@ -5748,7 +5770,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
-@@ -5848,7 +5870,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
-@@ -5888,7 +5910,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
-@@ -5955,7 +5977,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
-@@ -5995,7 +6017,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
-@@ -6552,9 +6574,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.
-@@ -6563,8 +6585,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 ()
- {
-@@ -6573,16 +6595,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
-@@ -6609,8 +6631,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 ()
- {
-@@ -6633,8 +6655,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 ()
- {
-@@ -6678,8 +6700,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 ()
- {
-@@ -6702,8 +6724,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 ()
- {
-@@ -6886,7 +6908,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 :
-@@ -6926,8 +6948,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);
-@@ -8297,8 +8318,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
-@@ -38117,7 +38138,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
-@@ -38196,7 +38217,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
-@@ -38452,7 +38473,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
-@@ -38496,7 +38517,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
-@@ -38920,7 +38941,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
-@@ -38960,7 +38981,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
-@@ -39266,7 +39287,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
-@@ -39306,7 +39327,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
-@@ -39409,7 +39430,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
-@@ -39453,7 +39474,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
-@@ -39578,7 +39599,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
-@@ -39618,7 +39639,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
-@@ -39677,7 +39698,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
-@@ -39717,7 +39738,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
-@@ -40366,7 +40387,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
-@@ -40406,7 +40427,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
-@@ -40486,7 +40507,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
-@@ -40526,7 +40547,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
-@@ -40578,7 +40599,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
-@@ -40618,7 +40639,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
-@@ -40670,7 +40691,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
-@@ -40710,7 +40731,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
-@@ -40762,7 +40783,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
-@@ -40802,7 +40823,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
-@@ -40854,7 +40875,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
-@@ -40894,7 +40915,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
-@@ -45143,7 +45164,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
-@@ -45342,7 +45363,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 :
-@@ -45382,8 +45403,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);
-@@ -46127,9 +46147,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.
-@@ -46138,8 +46158,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 ()
- {
-@@ -46148,16 +46168,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
-@@ -46184,8 +46204,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 ()
- {
-@@ -46208,8 +46228,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 ()
- {
-@@ -46253,8 +46273,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 ()
- {
-@@ -46277,8 +46297,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 ()
- {
-@@ -46829,7 +46849,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
-@@ -46867,7 +46887,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
-@@ -46905,7 +46925,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
-@@ -46943,7 +46963,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
-@@ -47112,7 +47132,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
-@@ -47188,7 +47208,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
-@@ -47329,6 +47349,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.
-@@ -47349,7 +47370,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
-@@ -47392,7 +47413,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
-@@ -47457,6 +47478,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
-@@ -47473,6 +47495,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
-@@ -47492,9 +47515,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
-@@ -47663,7 +47686,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
-@@ -47704,7 +47727,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
-@@ -47745,7 +47768,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
-@@ -47785,7 +47808,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
-@@ -47825,7 +47848,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
-@@ -47896,7 +47919,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
-@@ -47940,7 +47963,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
-@@ -47987,7 +48010,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
-@@ -48036,7 +48059,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
-@@ -48079,7 +48102,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
-@@ -48137,7 +48160,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
-@@ -48180,7 +48203,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
-@@ -48223,7 +48246,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
-@@ -48266,7 +48289,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
-@@ -48338,7 +48361,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
-@@ -48400,7 +48423,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
-@@ -48676,6 +48699,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
-@@ -48692,6 +48716,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
-@@ -48711,9 +48736,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
-@@ -48728,7 +48753,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; }
-@@ -48744,7 +48768,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
-@@ -48823,6 +48846,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
-@@ -48839,6 +48863,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
-@@ -48858,9 +48883,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
-@@ -48908,6 +48933,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
-@@ -48924,6 +48950,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
-@@ -48943,9 +48970,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
-@@ -48993,6 +49020,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
-@@ -49009,6 +49037,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
-@@ -49028,9 +49057,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
-@@ -49078,6 +49107,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
-@@ -49094,6 +49124,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
-@@ -49113,9 +49144,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
-@@ -49171,6 +49202,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
-@@ -49187,6 +49219,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
-@@ -49206,9 +49239,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
-@@ -49289,7 +49322,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
-@@ -49333,7 +49366,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
-@@ -52875,7 +52908,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
-@@ -52944,7 +52977,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
-@@ -52984,7 +53017,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
-@@ -53049,7 +53082,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
-@@ -53089,7 +53122,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
-@@ -53159,7 +53192,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
-@@ -53199,7 +53232,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
-@@ -53263,7 +53296,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
-@@ -53303,7 +53336,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
-@@ -53372,7 +53405,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
-@@ -53412,7 +53445,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
-@@ -53466,7 +53499,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
-@@ -53506,7 +53539,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
-@@ -53560,7 +53593,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
-@@ -53600,7 +53633,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
-@@ -53654,7 +53687,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
-@@ -53694,7 +53727,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
-@@ -53748,7 +53781,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
-@@ -53788,7 +53821,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
-@@ -53843,7 +53876,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
-@@ -53883,7 +53916,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
-@@ -54069,7 +54102,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
-@@ -54127,7 +54160,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
-@@ -54208,7 +54241,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
-@@ -54411,7 +54444,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
-@@ -54449,7 +54482,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
-@@ -54774,7 +54807,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
-@@ -54834,7 +54867,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
-@@ -54872,7 +54905,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
-@@ -54941,7 +54974,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
-@@ -54984,7 +55017,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
-@@ -55049,7 +55082,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
-@@ -55092,7 +55125,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
-@@ -55237,7 +55270,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
-@@ -55280,7 +55313,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
-@@ -55347,7 +55380,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
-@@ -55390,7 +55423,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
-@@ -55549,6 +55582,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
-@@ -55565,6 +55599,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
-@@ -55584,9 +55619,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
-@@ -55629,6 +55664,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
-@@ -55645,6 +55681,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
-@@ -55664,9 +55701,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
-@@ -55721,7 +55758,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
-@@ -55877,7 +55914,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
-@@ -55919,7 +55956,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
-@@ -55963,7 +56000,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
-@@ -56032,6 +56069,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
-@@ -56048,6 +56086,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
-@@ -56067,9 +56106,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
-@@ -56084,7 +56123,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; }
-@@ -56100,7 +56138,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
-@@ -56855,16 +56892,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
-@@ -56924,28 +56961,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'"
-@@ -56967,7 +56992,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.5, 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
-@@ -57037,10 +57062,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.5
--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."
-
-@@ -57131,7 +57156,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 5079385..91a753d 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- pkglibexecdir = @pkglibexecdir@
- ACLOCAL = @ACLOCAL@
-diff --git a/daemon/Makefile.in b/daemon/Makefile.in
-index a5939df..c73b829 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.6 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@
-@@ -296,6 +313,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)
-@@ -1527,8 +1549,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; \
-@@ -3084,10 +3109,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 481c89b..1685188 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.6 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@
-@@ -240,6 +257,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/||"`;; \
-@@ -1402,8 +1424,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; \
-@@ -1617,11 +1642,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 01088cf..22dc865 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.6 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@
-@@ -237,6 +254,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/||"`;; \
-@@ -1391,8 +1413,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; \
-@@ -1561,11 +1586,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 f167aa4..dc3776f 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.6 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@
-@@ -238,6 +255,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/||"`;; \
-@@ -1368,8 +1390,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; \
-@@ -1478,8 +1503,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 bd0146e..cdade03 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.6 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@
-@@ -181,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 +1324,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 3c112ac..9435126 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.6 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@
-@@ -268,6 +285,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/||"`;; \
-@@ -1619,11 +1641,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"; \
-@@ -1655,11 +1684,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 0e1dea8..6f072ca 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.6 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@
-@@ -314,6 +331,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)
-@@ -1553,8 +1575,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; \
-@@ -1599,8 +1624,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; \
-@@ -2221,11 +2249,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"; \
-@@ -2257,8 +2292,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"; \
-@@ -2275,8 +2313,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 bd10cc3..a1b000b 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.6 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@
-@@ -238,6 +255,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/||"`;; \
-@@ -1391,8 +1413,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; \
-@@ -1561,11 +1586,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 8fe3117..1befd4c 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.6 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@
-@@ -245,6 +262,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/||"`;; \
-@@ -1400,8 +1422,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; \
-@@ -1570,11 +1595,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 73be48a..7758877 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.6 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@
-@@ -180,6 +197,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 b48411d..4c65a08 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.6 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@
-@@ -241,6 +258,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- HEADERS = $(noinst_HEADERS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-@@ -1881,13 +1903,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 2b32e44..c7fb726 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.6 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@
-@@ -1172,6 +1189,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
-@@ -3472,13 +3494,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 92c03fb..47b9c9b 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.6 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@
-@@ -336,6 +353,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 \
-@@ -1584,7 +1606,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 \
-@@ -1592,6 +1613,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)"; \
- }
-@@ -1979,8 +2002,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"; \
-@@ -1997,8 +2023,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"; \
-@@ -2015,8 +2044,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"; \
-@@ -2292,13 +2324,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/docs/Makefile.in b/gobject/docs/Makefile.in
-index e2a2b20..c8c00e9 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.6 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@
-@@ -187,6 +204,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 d900fc0..1b7df56 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-diff --git a/inspector/Makefile.in b/inspector/Makefile.in
-index b661f21..7cc1928 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.6 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@
-@@ -248,6 +265,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/||"`;; \
-@@ -1416,8 +1438,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; \
-@@ -1586,11 +1611,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"; \
-@@ -1622,8 +1654,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 991c3c5..fff9385 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.6 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@
-@@ -289,6 +306,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
-@@ -1450,7 +1472,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 \
-@@ -1458,6 +1479,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)"; \
- }
-@@ -1525,8 +1548,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 b4adcd1..42725d6 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.6 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@
-@@ -183,6 +200,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/||"`;; \
-@@ -1308,11 +1330,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 df62eb6..154bfad 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.6 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@
-@@ -249,6 +266,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 3d3eb9e..7aa6bc3 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.6 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@
-@@ -183,6 +200,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -1309,11 +1331,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 c9d8d2f..d2d3fa6 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.6 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@
-@@ -200,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)
-@@ -1593,6 +1615,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 ee7dd39..1eba7a8 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.6 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@
-@@ -181,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 +1324,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 41fe2d3..917497b 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.6 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@
-@@ -199,6 +216,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/||"`;; \
-@@ -1326,8 +1348,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 85a02a6..1e4be37 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.6 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@
-@@ -191,6 +208,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=) \
-@@ -1485,13 +1507,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 d381d50..b893dec 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.6 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@
-@@ -184,6 +201,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 661454a..e13eb1b 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.6 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@
-@@ -184,6 +201,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 00056ea..1f25487 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- pkglibexecdir = @pkglibexecdir@
- ACLOCAL = @ACLOCAL@
-diff --git a/python/Makefile.in b/python/Makefile.in
-index bb77bbd..253d8d3 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.6 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@
-@@ -266,6 +283,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
-@@ -1372,7 +1394,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 \
-@@ -1380,6 +1401,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)"; \
- }
-@@ -1455,8 +1478,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 de85ca0..db28a6f 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.6 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@
-@@ -181,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 +1324,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 7a87e39..e17f24e 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.6 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@
-@@ -238,6 +255,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/||"`;; \
-@@ -1381,8 +1403,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; \
-@@ -1551,11 +1576,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 f32ad7b..119ffde 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.6 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@
-@@ -231,6 +248,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)
-@@ -1368,8 +1390,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; \
-@@ -1406,11 +1431,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 6c435c8..b6bf027 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -1269,8 +1291,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:
-@@ -1590,10 +1612,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 6c1b131..4424cb1 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.6 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@
-@@ -181,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 +1324,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 23cee7a..d9d3747 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.6 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@
-@@ -230,6 +247,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)
-@@ -1365,8 +1387,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; \
-@@ -1403,11 +1428,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 1403923..15aeb89 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.6 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@
-@@ -303,6 +320,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)
-@@ -1477,7 +1499,8 @@ libguestfs_la_LIBADD = $(HIVEX_LIBS) $(AUGEAS_LIBS) $(PCRE_LIBS) \
-
- # Make libguestfs include the convenience libraries.
- noinst_LTLIBRARIES = liberrnostring.la libprotocol.la
--libguestfs_la_CFLAGS = -DGUESTFS_DEFAULT_PATH='"$(libdir)/guestfs"' \
-+libguestfs_la_CFLAGS = \
-+ -DGUESTFS_DEFAULT_PATH='"$(prefix)/lib/guestfs"' \
- -DGUESTFS_WARN_DEPRECATED=1 $(HIVEX_CFLAGS) $(AUGEAS_CFLAGS) \
- $(PCRE_CFLAGS) $(LIBVIRT_CFLAGS) $(LIBXML2_CFLAGS) \
- $(WARN_CFLAGS) $(WERROR_CFLAGS) $(GCC_VISIBILITY_HIDDEN) \
-@@ -1531,7 +1554,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 \
-@@ -1539,6 +1561,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)"; \
- }
-@@ -1795,11 +1819,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"; \
-@@ -1831,8 +1862,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"; \
-@@ -1849,8 +1883,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 64f0ea0..d307bb8 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.6 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@
-@@ -229,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)
-@@ -1421,8 +1443,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; \
-@@ -1459,11 +1484,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 6fc1058..945d8ff 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.6 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@
-@@ -233,6 +250,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/||"`;; \
-@@ -1354,8 +1376,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; \
-@@ -1449,11 +1474,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 538a326..daebc71 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-diff --git a/tests/c-api/Makefile.in b/tests/c-api/Makefile.in
-index 484788c..a5f7694 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.6 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@
-@@ -345,6 +362,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/charsets/Makefile.in b/tests/charsets/Makefile.in
-index 855ec27..ff03eb7 100644
---- a/tests/charsets/Makefile.in
-+++ b/tests/charsets/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11.3 from Makefile.am.
-+# Makefile.in generated by automake 1.11.6 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@
-@@ -233,6 +250,11 @@ am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
- am__v_GEN_0 = @echo " GEN " $@;
- SOURCES = $(test_charset_fidelity_SOURCES)
- DIST_SOURCES = $(test_charset_fidelity_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 e8c6146..17c4f2d 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.6 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@
-@@ -199,6 +216,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 fa0eecb..a8d1ecd 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.6 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -66,6 +66,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@
-@@ -214,6 +231,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 76bfa0e..5f652f8 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- 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 2c479d4..61d01e1 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-diff --git a/tests/lvm/Makefile.in b/tests/lvm/Makefile.in
-index f2e864e..1025604 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-diff --git a/tests/md/Makefile.in b/tests/md/Makefile.in
-index 70e24bc..09bd91e 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-diff --git a/tests/ntfsclone/Makefile.in b/tests/ntfsclone/Makefile.in
-index 318bdf0..ee1a16c 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-diff --git a/tests/protocol/Makefile.in b/tests/protocol/Makefile.in
-index 9c14bb4..38f9183 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.6 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@
-@@ -198,6 +215,11 @@ am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
- am__v_at_0 = @
- SOURCES =
- DIST_SOURCES =
-+am__can_run_installinfo = \
-+ case $$AM_UPDATE_INFO_DIR in \
-+ n|no|NO) false;; \
-+ *) (install-info --version) >/dev/null 2>&1;; \
-+ esac
- am__tty_colors = \
- red=; grn=; lgn=; blu=; std=
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-diff --git a/tests/qemu/Makefile.in b/tests/qemu/Makefile.in
-index 50b9595..417e350 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.6 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@
-@@ -202,6 +219,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 ddff170..22ce015 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.6 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@
-@@ -238,6 +255,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 b07a545..549ddcf 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.6 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@
-@@ -231,6 +248,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 ad5d9d4..9802f44 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.6 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@
-@@ -229,6 +246,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)
-@@ -1342,8 +1364,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; \
-@@ -1380,11 +1405,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/debian/patches/series b/debian/patches/series
index 866f747..d806aa0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@
0006-ruby-install-to-vendor_ruby.patch
0007-podwrapper.sh-Use-date-from-ChangeLog.patch
0008-Fix-guestfs-supermin-appliance-path.patch
-0009-autoreconf.patch
diff --git a/debian/rules b/debian/rules
index 1f3c435..b72fab1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -142,4 +142,4 @@ override_dh_makeshlibs:
%:
dh $@ \
--without=python-support \
- --with=autotools-dev,ocaml,python2,python3,bash-completion,ruby,gir
+ --with=autoreconf,ocaml,python2,python3,bash-completion,ruby,gir
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list