[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1.14.0-1-4-g4a82e6b
Hilko Bengen
bengen at debian.org
Sun Oct 30 15:23:51 UTC 2011
The following commit has been merged in the master branch:
commit 19863e131ec6e53132d7eede33901019058fb864
Author: Hilko Bengen <bengen at debian.org>
Date: Fri Oct 28 15:27:51 2011 +0200
Imported patch queue from 1.13.24-1 (experimental)
diff --git a/debian/patches/0004-configure.ac-do-not-generate-debian-changelog.patch b/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch
similarity index 70%
rename from debian/patches/0004-configure.ac-do-not-generate-debian-changelog.patch
rename to debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch
index c25df1f..bfb283c 100644
--- a/debian/patches/0004-configure.ac-do-not-generate-debian-changelog.patch
+++ b/debian/patches/0003-configure.ac-do-not-generate-debian-changelog.patch
@@ -7,15 +7,15 @@ Subject: configure.ac: do not generate debian/changelog
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 058e171..7cf9fce 100644
+index ef81f63..8a8bd51 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -828,7 +828,6 @@ AC_CONFIG_FILES([Makefile
- cat/Makefile
- caution/Makefile
+@@ -1003,7 +1003,6 @@ AC_CONFIG_FILES([Makefile
+ clone/Makefile
csharp/Makefile
+ daemon/Makefile
- debian/changelog
df/Makefile
edit/Makefile
- examples/Makefile
+ erlang/Makefile
--
diff --git a/debian/patches/0003-disable-apparently-broken-getlogin_r-test-from-gnuli.patch b/debian/patches/0003-disable-apparently-broken-getlogin_r-test-from-gnuli.patch
deleted file mode 100644
index 174d05e..0000000
--- a/debian/patches/0003-disable-apparently-broken-getlogin_r-test-from-gnuli.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Wed, 6 Jul 2011 01:40:41 +0200
-Subject: disable apparently broken getlogin_r test from gnulib
-
-test-getlogin_r.c:42: assertion failed
-/bin/bash: line 5: 15823 Aborted EXEEXT='' srcdir='.' LOCALE_FR='fr_FR' LOCALE_FR_UTF8='fr_FR.UTF-8' LOCALE_JA='ja_JP.EUC-JP' LOCALE_ZH_CN='zh_CN.GB18030' LOCALE_FR_UTF8='fr_FR.UTF-8' LOCALE_FR='fr_FR' LOCALE_FR_UTF8='fr_FR.UTF-8' LOCALE_JA='ja_JP.EUC-JP' LOCALE_ZH_CN='zh_CN.GB18030' MAKE='make' ${dir}$tst
-FAIL: test-getlogin_r
----
- daemon/tests/test-getlogin_r.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/daemon/tests/test-getlogin_r.c b/daemon/tests/test-getlogin_r.c
-index 2a20fd9..fa504ef 100644
---- a/daemon/tests/test-getlogin_r.c
-+++ b/daemon/tests/test-getlogin_r.c
-@@ -33,6 +33,8 @@ SIGNATURE_CHECK (getlogin_r, int, (char *, size_t));
- int
- main (void)
- {
-+ fprintf (stderr, "Skipping test: Test seems to be broken -- Hilko Bengen\n");
-+ return 77;
- /* Test with a large enough buffer. */
- char buf[1024];
- int err;
---
diff --git a/debian/patches/0005-Do-not-run-appliance-related-checks-if-not-building-.patch b/debian/patches/0004-Do-not-run-appliance-related-checks-if-not-building-.patch
similarity index 76%
rename from debian/patches/0005-Do-not-run-appliance-related-checks-if-not-building-.patch
rename to debian/patches/0004-Do-not-run-appliance-related-checks-if-not-building-.patch
index 48b739b..93cb14b 100644
--- a/debian/patches/0005-Do-not-run-appliance-related-checks-if-not-building-.patch
+++ b/debian/patches/0004-Do-not-run-appliance-related-checks-if-not-building-.patch
@@ -3,21 +3,23 @@ Date: Sat, 20 Aug 2011 10:34:46 +0200
Subject: Do not run appliance-related checks if not building appliance
---
- Makefile.am | 5 ++++-
- cat/Makefile.am | 2 ++
- df/Makefile.am | 2 ++
- edit/Makefile.am | 2 ++
- fuse/Makefile.am | 4 +++-
- images/Makefile.am | 2 ++
- ocaml/Makefile.am | 10 +++++++---
- perl/Makefile.am | 10 ++++++++--
- python/Makefile.am | 8 ++++++--
- resize/Makefile.am | 2 ++
- tools/Makefile.am | 2 ++
- 11 files changed, 40 insertions(+), 9 deletions(-)
+ Makefile.am | 5 ++++-
+ cat/Makefile.am | 2 ++
+ clone/Makefile.am | 2 ++
+ df/Makefile.am | 2 ++
+ edit/Makefile.am | 2 ++
+ fuse/Makefile.am | 4 +++-
+ images/Makefile.am | 2 ++
+ ocaml/Makefile.am | 10 +++++++---
+ perl/Makefile.am | 10 ++++++++--
+ python/Makefile.am | 8 ++++++--
+ resize/Makefile.am | 2 ++
+ sparsify/Makefile.am | 2 ++
+ tools/Makefile.am | 2 ++
+ 13 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index ca31727..1c5e873 100644
+index 388cdeb..927e442 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,10 @@ SUBDIRS += appliance
@@ -43,6 +45,17 @@ index 91abfac..b1a672e 100644
+if ENABLE_APPLIANCE
TESTS = test-virt-cat.sh test-virt-filesystems.sh test-virt-ls.sh
+endif ENABLE_APPLIANCE
+diff --git a/clone/Makefile.am b/clone/Makefile.am
+index 20e1d52..b01637c 100644
+--- a/clone/Makefile.am
++++ b/clone/Makefile.am
+@@ -48,4 +48,6 @@ TESTS_ENVIRONMENT = \
+ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir)
+
++if ENABLE_APPLIANCE
+ TESTS = test-virt-sysprep.sh
++endif ENABLE_APPLIANCE
diff --git a/df/Makefile.am b/df/Makefile.am
index 6281c96..63ba403 100644
--- a/df/Makefile.am
@@ -96,7 +109,7 @@ index 90c4ce3..1b554f4 100644
CLEANFILES = \
test.iso test.sqsh \
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
-index 8daa671..ba9aee7 100644
+index 28c13c5..83b8f09 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -75,11 +75,15 @@ TESTS_ENVIRONMENT = \
@@ -141,7 +154,7 @@ index d8167d1..6212915 100644
TESTS_ENVIRONMENT = \
LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
diff --git a/python/Makefile.am b/python/Makefile.am
-index 5884762..19f6e00 100644
+index 82960d6..97fae83 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -50,6 +50,10 @@ TESTS_ENVIRONMENT = \
@@ -158,10 +171,10 @@ index 5884762..19f6e00 100644
+
+endif HAVE_PYTHON
diff --git a/resize/Makefile.am b/resize/Makefile.am
-index 93a2600..395f32d 100644
+index e8ffff0..5112605 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
-@@ -86,7 +86,9 @@ TESTS_ENVIRONMENT = \
+@@ -99,7 +99,9 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -171,6 +184,20 @@ index 93a2600..395f32d 100644
# Dependencies.
depend: .depend
+diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
+index ab90818..8e6bfc3 100644
+--- a/sparsify/Makefile.am
++++ b/sparsify/Makefile.am
+@@ -98,7 +98,9 @@ TESTS_ENVIRONMENT = \
+ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir)
+
++if ENABLE_APPLIANCE
+ TESTS = test-virt-sparsify.sh
++endif ENABLE_APPLIANCE
+
+ # Dependencies.
+ depend: .depend
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5586bf8..60c4046 100644
--- a/tools/Makefile.am
diff --git a/debian/patches/0006-check-for-febootstrap-etc.-even-if-not-building-appl.patch b/debian/patches/0005-check-for-febootstrap-etc.-even-if-not-building-appl.patch
similarity index 97%
rename from debian/patches/0006-check-for-febootstrap-etc.-even-if-not-building-appl.patch
rename to debian/patches/0005-check-for-febootstrap-etc.-even-if-not-building-appl.patch
index 32765e8..92e4a76 100644
--- a/debian/patches/0006-check-for-febootstrap-etc.-even-if-not-building-appl.patch
+++ b/debian/patches/0005-check-for-febootstrap-etc.-even-if-not-building-appl.patch
@@ -7,10 +7,10 @@ Subject: check for febootstrap etc. even if not building appliance
1 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 7cf9fce..4130f17 100644
+index 8a8bd51..897ab32 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -192,46 +192,47 @@ AC_ARG_ENABLE([appliance],
+@@ -264,46 +264,47 @@ AC_ARG_ENABLE([appliance],
AM_CONDITIONAL([ENABLE_APPLIANCE],[test "x$enable_appliance" = "xyes"])
AC_MSG_RESULT([$enable_appliance])
diff --git a/debian/patches/0008-Fix-for-systemd-based-Debian-systems.patch b/debian/patches/0006-Fix-for-systemd-based-Debian-systems.patch
similarity index 100%
rename from debian/patches/0008-Fix-for-systemd-based-Debian-systems.patch
rename to debian/patches/0006-Fix-for-systemd-based-Debian-systems.patch
diff --git a/debian/patches/0009-out-of-tree-build-fix-building-Perl-bindings.patch b/debian/patches/0007-out-of-tree-build-fix-building-Perl-bindings.patch
similarity index 100%
rename from debian/patches/0009-out-of-tree-build-fix-building-Perl-bindings.patch
rename to debian/patches/0007-out-of-tree-build-fix-building-Perl-bindings.patch
diff --git a/debian/patches/0007-python-don-t-build-static-library.patch b/debian/patches/0007-python-don-t-build-static-library.patch
deleted file mode 100644
index 6f682ee..0000000
--- a/debian/patches/0007-python-don-t-build-static-library.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Fri, 5 Aug 2011 10:18:02 +0100
-Subject: python: don't build static library
-
----
- python/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/python/Makefile.am b/python/Makefile.am
-index 19f6e00..97fae83 100644
---- a/python/Makefile.am
-+++ b/python/Makefile.am
-@@ -43,7 +43,7 @@ libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c
- libguestfsmod_la_CFLAGS = -Wall -I$(PYTHON_INCLUDEDIR) \
- -I$(top_srcdir)/src -I$(top_builddir)/src
- libguestfsmod_la_LIBADD = $(top_builddir)/src/libguestfs.la
--libguestfsmod_la_LDFLAGS = -avoid-version
-+libguestfsmod_la_LDFLAGS = -avoid-version -shared
-
- TESTS_ENVIRONMENT = \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
---
diff --git a/debian/patches/0010-out-of-tree-build-daemon.patch b/debian/patches/0008-out-of-tree-build-daemon.patch
similarity index 89%
rename from debian/patches/0010-out-of-tree-build-daemon.patch
rename to debian/patches/0008-out-of-tree-build-daemon.patch
index c16c4eb..060af28 100644
--- a/debian/patches/0010-out-of-tree-build-daemon.patch
+++ b/debian/patches/0008-out-of-tree-build-daemon.patch
@@ -7,10 +7,10 @@ Subject: out-of-tree build: daemon
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
-index 3fe8c88..c6c3cef 100644
+index f8e0ecb..87c92f2 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
-@@ -52,10 +52,10 @@ noinst_LIBRARIES = libprotocol.a
+@@ -42,10 +42,10 @@ noinst_LIBRARIES = libprotocol.a
libprotocol_a_SOURCES = guestfs_protocol.c guestfs_protocol.h
libprotocol_a_CFLAGS = -Wall -Wno-unused -fno-strict-aliasing
diff --git a/debian/patches/0009-Fix-en-dis-able-install-daemon.patch b/debian/patches/0009-Fix-en-dis-able-install-daemon.patch
new file mode 100644
index 0000000..492d58d
--- /dev/null
+++ b/debian/patches/0009-Fix-en-dis-able-install-daemon.patch
@@ -0,0 +1,24 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Fri, 21 Oct 2011 23:46:24 +0200
+Subject: Fix --{en,dis}able-install-daemon
+
+---
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 897ab32..5c2b9cc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -250,9 +250,9 @@ if test "x$enable_daemon" = "xyes"; then
+ [enable installing the daemon under $sbindir @<:@default=no@:>@])],
+ [],
+ [enable_install_daemon=no])
+- AM_CONDITIONAL([INSTALL_DAEMON],[test "x$enable_install_daemon" = "xyes"])
+ AC_MSG_RESULT([$enable_install_daemon])
+ fi
++AM_CONDITIONAL([INSTALL_DAEMON],[test "x$enable_install_daemon" = "xyes"])
+
+ dnl Build the appliance?
+ AC_MSG_CHECKING([if we should build the appliance])
+--
diff --git a/debian/patches/0010-Fix-include.patch b/debian/patches/0010-Fix-include.patch
new file mode 100644
index 0000000..8e36387
--- /dev/null
+++ b/debian/patches/0010-Fix-include.patch
@@ -0,0 +1,63 @@
+From: Hilko Bengen <bengen at debian.org>
+Date: Sat, 22 Oct 2011 01:05:05 +0200
+Subject: Fix include
+
+---
+ resize/Makefile.am | 4 ++--
+ sparsify/Makefile.am | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/resize/Makefile.am b/resize/Makefile.am
+index 5112605..0872349 100644
+--- a/resize/Makefile.am
++++ b/resize/Makefile.am
+@@ -37,7 +37,7 @@ SOURCES = \
+
+ # Note this list must be in dependency order.
+ OBJECTS = \
+- ../fish/guestfish-progress.o \
++ $(top_builddir)/fish/guestfish-progress.o \
+ progress_c.o \
+ utils.cmx \
+ progress.cmx \
+@@ -67,7 +67,7 @@ virt-resize: $(OBJECTS)
+ # automake will decide we don't need C support in this file. Really
+ # we do, so we have to provide it ourselves.
+
+-DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I../fish
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I$(top_srcdir)/fish
+
+ .c.o:
+ $(CC) $(CFLAGS) $(PROF_CFLAGS) $(DEFAULT_INCLUDES) -c $< -o $@
+diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
+index 8e6bfc3..b8ef398 100644
+--- a/sparsify/Makefile.am
++++ b/sparsify/Makefile.am
+@@ -36,7 +36,7 @@ SOURCES = \
+
+ # Note this list must be in dependency order.
+ OBJECTS = \
+- ../fish/guestfish-progress.o \
++ $(top_builddir)/fish/guestfish-progress.o \
+ progress_c.o \
+ utils.cmx \
+ progress.cmx \
+@@ -47,7 +47,7 @@ bin_SCRIPTS = virt-sparsify
+ # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
+ # option to be passed to gcc, so we don't try linking against an
+ # installed copy of libguestfs.
+-OCAMLPACKAGES = -package unix -I $(top_builddir)/src/.libs -I ../ocaml
++OCAMLPACKAGES = -package unix -I $(top_builddir)/src/.libs -I $(top_builddir)/ocaml
+
+ OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
+ OCAMLOPTFLAGS = $(OCAMLCFLAGS)
+@@ -66,7 +66,7 @@ virt-sparsify: $(OBJECTS)
+ # automake will decide we don't need C support in this file. Really
+ # we do, so we have to provide it ourselves.
+
+-DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I../fish
++DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I$(top_srcdir)/fish
+
+ .c.o:
+ $(CC) $(CFLAGS) $(PROF_CFLAGS) $(DEFAULT_INCLUDES) -c $< -o $@
+--
diff --git a/debian/patches/0013-autoreconf.patch b/debian/patches/0011-autoreconf.patch
similarity index 67%
rename from debian/patches/0013-autoreconf.patch
rename to debian/patches/0011-autoreconf.patch
index e4c87e4..f0ca6be 100644
--- a/debian/patches/0013-autoreconf.patch
+++ b/debian/patches/0011-autoreconf.patch
@@ -3,26 +3,26 @@ Date: Sat, 20 Aug 2011 20:43:22 +0200
Subject: autoreconf
---
- Makefile.in | 41 +++++++++++-------------
- aclocal.m4 | 14 +++++---
- cat/Makefile.in | 2 +-
- configure | 83 +++++++++++++++++++++++++++---------------------
- daemon/Makefile.in | 4 +-
- df/Makefile.in | 2 +-
- edit/Makefile.in | 2 +-
- fuse/Makefile.in | 2 +-
- generator/Makefile.in | 2 +-
- images/Makefile.in | 2 +-
- inspector/Makefile.in | 2 +-
- ocaml/Makefile.in | 19 +++++------
- perl/Makefile.in | 8 +++-
- python/Makefile.in | 5 ++-
- resize/Makefile.in | 2 +-
- tools/Makefile.in | 6 ++--
- 16 files changed, 105 insertions(+), 91 deletions(-)
+ Makefile.in | 47 ++++++++++++--------------
+ aclocal.m4 | 14 ++++---
+ cat/Makefile.in | 2 +-
+ clone/Makefile.in | 2 +-
+ configure | 91 ++++++++++++++++++++++++++++----------------------
+ daemon/Makefile.in | 4 +-
+ df/Makefile.in | 2 +-
+ edit/Makefile.in | 2 +-
+ fuse/Makefile.in | 2 +-
+ images/Makefile.in | 2 +-
+ ocaml/Makefile.in | 19 +++++-----
+ perl/Makefile.in | 8 +++-
+ python/Makefile.in | 3 +-
+ resize/Makefile.in | 6 ++--
+ sparsify/Makefile.in | 8 ++--
+ tools/Makefile.in | 6 ++--
+ 16 files changed, 116 insertions(+), 102 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index add3b26..84430ca 100644
+index 3a8c3f6..58d7d6d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -33,7 +33,7 @@ index add3b26..84430ca 100644
$(top_srcdir)/subdir-rules.mk ABOUT-NLS AUTHORS COPYING \
COPYING.LIB ChangeLog TODO build-aux/compile \
build-aux/config.guess build-aux/config.rpath \
-@@ -79,27 +78,28 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+@@ -79,31 +78,32 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
build-aux/ltmain.sh build-aux/missing
@ENABLE_DAEMON_TRUE at am__append_1 = daemon
@ENABLE_APPLIANCE_TRUE at am__append_2 = appliance
@@ -47,6 +47,7 @@ index add3b26..84430ca 100644
- at HAVE_JAVA_TRUE@am__append_7 = java java/examples
- at HAVE_HASKELL_TRUE@am__append_8 = haskell
- at HAVE_PHP_TRUE@am__append_9 = php
+- at HAVE_ERLANG_TRUE@am__append_10 = erlang erlang/examples
+ at HAVE_PERL_TRUE@am__append_4 = perl perl/examples
+ at HAVE_OCAML_TRUE@am__append_5 = ocaml ocaml/examples
+ at HAVE_PYTHON_TRUE@am__append_6 = python python/examples
@@ -54,26 +55,31 @@ index add3b26..84430ca 100644
+ at HAVE_JAVA_TRUE@am__append_8 = java java/examples
+ at HAVE_HASKELL_TRUE@am__append_9 = haskell
+ at HAVE_PHP_TRUE@am__append_10 = php
++ at HAVE_ERLANG_TRUE@am__append_11 = erlang erlang/examples
- # virt-resize 2.0 is written in OCaml.
-- at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at am__append_10 = resize
-+ at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at am__append_11 = resize
+ # virt-resize (new version) and virt-sparsify are written in OCaml.
+- at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at am__append_11 = resize
+- at HAVE_OCAML_TRUE@am__append_12 = sparsify
++ at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at am__append_12 = resize
++ at HAVE_OCAML_TRUE@am__append_13 = sparsify
# Perl tools.
-- at HAVE_TOOLS_TRUE@am__append_11 = tools
-+ at HAVE_TOOLS_TRUE@am__append_12 = tools
+- at HAVE_TOOLS_TRUE@am__append_13 = tools
++ at HAVE_TOOLS_TRUE@am__append_14 = tools
# guestmount
-- at HAVE_FUSE_TRUE@am__append_12 = fuse
-+ at HAVE_FUSE_TRUE@am__append_13 = fuse
+
+ # virt-tools in shell. This uses guestmount and virt-inspector.
+- at HAVE_FUSE_TRUE@am__append_14 = fuse clone
++ at HAVE_FUSE_TRUE@am__append_15 = fuse clone
# po-docs must come after tools, inspector.
-- at HAVE_PO4A_TRUE@am__append_13 = po-docs
-+ at HAVE_PO4A_TRUE@am__append_14 = po-docs
+- at HAVE_PO4A_TRUE@am__append_15 = po-docs
++ at HAVE_PO4A_TRUE@am__append_16 = po-docs
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -199,7 +199,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+@@ -229,7 +229,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
@@ -82,34 +88,36 @@ index add3b26..84430ca 100644
CONFIG_CLEAN_VPATH_FILES =
AM_V_GEN = $(am__v_GEN_$(V))
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-@@ -247,7 +247,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -277,7 +277,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = gnulib/lib images generator src examples po daemon \
- appliance gnulib/tests capitests caution regressions test-tool \
+ appliance gnulib/tests test-tool capitests caution regressions \
- fish cat df edit inspector rescue perl perl/examples ocaml \
- ocaml/examples python python/examples ruby ruby/examples java \
- java/examples haskell php csharp resize tools fuse po-docs
-@@ -1184,12 +1184,11 @@ ACLOCAL_AMFLAGS = -I m4
+ fish align cat df edit inspector rescue perl perl/examples \
+ ocaml ocaml/examples python python/examples ruby ruby/examples \
+ java java/examples haskell php erlang erlang/examples csharp \
+@@ -1318,13 +1318,12 @@ ACLOCAL_AMFLAGS = -I m4
# Unconditional because nothing is built yet.
SUBDIRS = gnulib/lib images generator src examples po $(am__append_1) \
- $(am__append_2) gnulib/tests capitests caution regressions \
-- test-tool fish cat df edit inspector rescue $(am__append_3) \
-- $(am__append_4) $(am__append_5) $(am__append_6) \
-- $(am__append_7) $(am__append_8) $(am__append_9) csharp \
-- $(am__append_10) $(am__append_11) $(am__append_12) \
-- $(am__append_13)
+- test-tool fish align cat df edit inspector rescue \
+- $(am__append_3) $(am__append_4) $(am__append_5) \
+- $(am__append_6) $(am__append_7) $(am__append_8) \
+- $(am__append_9) $(am__append_10) csharp $(am__append_11) \
+- $(am__append_12) $(am__append_13) $(am__append_14) \
+- $(am__append_15)
+ $(am__append_2) gnulib/tests test-tool $(am__append_3) fish \
-+ cat df edit inspector rescue $(am__append_4) $(am__append_5) \
-+ $(am__append_6) $(am__append_7) $(am__append_8) \
-+ $(am__append_9) $(am__append_10) csharp $(am__append_11) \
-+ $(am__append_12) $(am__append_13) $(am__append_14)
++ align cat df edit inspector rescue $(am__append_4) \
++ $(am__append_5) $(am__append_6) $(am__append_7) \
++ $(am__append_8) $(am__append_9) $(am__append_10) \
++ $(am__append_11) csharp $(am__append_12) $(am__append_13) \
++ $(am__append_14) $(am__append_15) $(am__append_16)
EXTRA_DIST = \
$(generator_built) \
BUGS HACKING RELEASE-NOTES ROADMAP TODO \
-@@ -1336,8 +1335,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
+@@ -1475,8 +1474,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
run: $(top_builddir)/config.status $(srcdir)/run.in
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -119,7 +127,7 @@ index add3b26..84430ca 100644
cd $(top_builddir) && $(SHELL) ./config.status $@
diff --git a/aclocal.m4 b/aclocal.m4
-index 7ee8e1e..faf58b0 100644
+index 404fe3e..ef6bd0b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -47,7 +47,8 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
@@ -173,10 +181,10 @@ index 7ee8e1e..faf58b0 100644
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
diff --git a/cat/Makefile.in b/cat/Makefile.in
-index 4043f37..e53b774 100644
+index cc4fae2..0f8938e 100644
--- a/cat/Makefile.in
+++ b/cat/Makefile.in
-@@ -1244,7 +1244,7 @@ TESTS_ENVIRONMENT = \
+@@ -1373,7 +1373,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -185,11 +193,46 @@ index 4043f37..e53b774 100644
all: all-am
.SUFFIXES:
+diff --git a/clone/Makefile.in b/clone/Makefile.in
+index feba17d..b271059 100644
+--- a/clone/Makefile.in
++++ b/clone/Makefile.in
+@@ -1240,7 +1240,7 @@ TESTS_ENVIRONMENT = \
+ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ TMPDIR=$(top_builddir)
+
+-TESTS = test-virt-sysprep.sh
++ at ENABLE_APPLIANCE_TRUE@TESTS = test-virt-sysprep.sh
+ all: all-am
+
+ .SUFFIXES:
diff --git a/configure b/configure
-index a6dd65e..fe3ea94 100755
+index b42aec5..d623475 100755
--- a/configure
+++ b/configure
-@@ -36155,8 +36155,7 @@ fi
+@@ -46476,7 +46476,10 @@ else
+ enable_install_daemon=no
+ fi
+
+- if test "x$enable_install_daemon" = "xyes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_daemon" >&5
++$as_echo "$enable_install_daemon" >&6; }
++fi
++ if test "x$enable_install_daemon" = "xyes"; then
+ INSTALL_DAEMON_TRUE=
+ INSTALL_DAEMON_FALSE='#'
+ else
+@@ -46484,9 +46487,6 @@ else
+ INSTALL_DAEMON_FALSE=
+ fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_daemon" >&5
+-$as_echo "$enable_install_daemon" >&6; }
+-fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should build the appliance" >&5
+ $as_echo_n "checking if we should build the appliance... " >&6; }
+@@ -46508,8 +46508,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_appliance" >&5
$as_echo "$enable_appliance" >&6; }
@@ -199,7 +242,7 @@ index a6dd65e..fe3ea94 100755
set dummy febootstrap; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-@@ -36194,12 +36193,8 @@ $as_echo "no" >&6; }
+@@ -46547,12 +46546,8 @@ $as_echo "no" >&6; }
fi
@@ -213,7 +256,7 @@ index a6dd65e..fe3ea94 100755
$as_echo_n "checking if user requested febootstrap --yum-config option... " >&6; }
# Check whether --with-febootstrap-yum-config was given.
-@@ -36209,26 +36204,32 @@ else
+@@ -46562,26 +46557,32 @@ else
FEBOOTSTRAP_YUM_CONFIG=no
fi
@@ -238,15 +281,15 @@ index a6dd65e..fe3ea94 100755
- if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>&5; then
- DISTRO=UBUNTU
- fi
+- fi
+- if test -f /etc/arch-release; then
+- DISTRO=ARCHLINUX
+DISTRO=REDHAT
+if test -f /etc/debian_version; then
+ DISTRO=DEBIAN
+ if grep -q 'DISTRIB_ID=Ubuntu' /etc/lsb-release 2>&5; then
+ DISTRO=UBUNTU
fi
-- if test -f /etc/arch-release; then
-- DISTRO=ARCHLINUX
-- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DISTRO" >&5
+fi
+if test -f /etc/arch-release; then
@@ -259,7 +302,7 @@ index a6dd65e..fe3ea94 100755
# Extract the first word of "rpcgen", so it can be a program name with args.
set dummy rpcgen; ac_word=$2
-@@ -38878,6 +38879,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+@@ -49425,6 +49426,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
@@ -267,7 +310,7 @@ index a6dd65e..fe3ea94 100755
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.
-@@ -39006,6 +39008,7 @@ if test -n "$PCRE_CFLAGS"; then
+@@ -49553,6 +49555,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`
@@ -275,7 +318,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39022,6 +39025,7 @@ if test -n "$PCRE_LIBS"; then
+@@ -49569,6 +49572,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`
@@ -283,7 +326,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39041,9 +39045,9 @@ else
+@@ -49588,9 +49592,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -295,7 +338,7 @@ index a6dd65e..fe3ea94 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$PCRE_PKG_ERRORS" >&5
-@@ -39058,7 +39062,6 @@ installed software in a non-standard prefix.
+@@ -49605,7 +49609,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
@@ -303,7 +346,7 @@ index a6dd65e..fe3ea94 100755
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -39074,7 +39077,6 @@ See the pkg-config man page for more details.
+@@ -49621,7 +49624,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; }
@@ -311,7 +354,7 @@ index a6dd65e..fe3ea94 100755
else
PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS
PCRE_LIBS=$pkg_cv_PCRE_LIBS
-@@ -39153,6 +39155,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
+@@ -49700,6 +49702,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`
@@ -319,7 +362,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39169,6 +39172,7 @@ if test -n "$LIBVIRT_LIBS"; then
+@@ -49716,6 +49719,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`
@@ -327,7 +370,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39188,9 +39192,9 @@ else
+@@ -49735,9 +49739,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -339,7 +382,7 @@ index a6dd65e..fe3ea94 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBVIRT_PKG_ERRORS" >&5
-@@ -39238,6 +39242,7 @@ if test -n "$LIBXML2_CFLAGS"; then
+@@ -49785,6 +49789,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`
@@ -347,7 +390,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39254,6 +39259,7 @@ if test -n "$LIBXML2_LIBS"; then
+@@ -49801,6 +49806,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`
@@ -355,7 +398,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39273,9 +39279,9 @@ else
+@@ -49820,9 +49826,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -367,7 +410,7 @@ index a6dd65e..fe3ea94 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML2_PKG_ERRORS" >&5
-@@ -39323,6 +39329,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
+@@ -49870,6 +49876,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`
@@ -375,7 +418,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39339,6 +39346,7 @@ if test -n "$LIBCONFIG_LIBS"; then
+@@ -49886,6 +49893,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`
@@ -383,7 +426,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39358,9 +39366,9 @@ else
+@@ -49905,9 +49913,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -395,7 +438,7 @@ index a6dd65e..fe3ea94 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCONFIG_PKG_ERRORS" >&5
-@@ -39408,6 +39416,7 @@ if test -n "$HIVEX_CFLAGS"; then
+@@ -49955,6 +49963,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`
@@ -403,7 +446,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39424,6 +39433,7 @@ if test -n "$HIVEX_LIBS"; then
+@@ -49971,6 +49980,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`
@@ -411,7 +454,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39443,9 +39453,9 @@ else
+@@ -49990,9 +50000,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -423,7 +466,7 @@ index a6dd65e..fe3ea94 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$HIVEX_PKG_ERRORS" >&5
-@@ -39501,6 +39511,7 @@ if test -n "$FUSE_CFLAGS"; then
+@@ -50048,6 +50058,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`
@@ -431,7 +474,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39517,6 +39528,7 @@ if test -n "$FUSE_LIBS"; then
+@@ -50064,6 +50075,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`
@@ -439,7 +482,7 @@ index a6dd65e..fe3ea94 100755
else
pkg_failed=yes
fi
-@@ -39536,9 +39548,9 @@ else
+@@ -50083,9 +50095,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -451,30 +494,30 @@ index a6dd65e..fe3ea94 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$FUSE_PKG_ERRORS" >&5
-@@ -41310,7 +41322,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
+@@ -52441,7 +52453,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
ac_config_files="$ac_config_files run"
--ac_config_files="$ac_config_files Makefile appliance/Makefile capitests/Makefile cat/Makefile caution/Makefile csharp/Makefile debian/changelog df/Makefile edit/Makefile examples/Makefile fish/Makefile fuse/Makefile generator/Makefile gnulib/lib/Makefile gnulib/tests/Makefile haskell/Makefile images/Makefile inspector/Makefile java/Makefile java/examples/Makefile libguestfs.pc ocaml/META ocaml/Makefile ocaml/examples/Makefile perl/Makefile perl/Makefile.PL perl/examples/Makefile php/Makefile po-docs/Makefile po-docs/ja/Makefile po-docs/uk/Makefile po/Makefile.in python/Makefile python/examples/Makefile regressions/Makefile rescue/Makefile resize/Makefile ruby/Makefile ruby/Rakefile ruby/examples/Makefile src/Makefile test-tool/Makefile tools/Makefile"
-+ac_config_files="$ac_config_files Makefile appliance/Makefile capitests/Makefile cat/Makefile caution/Makefile csharp/Makefile df/Makefile edit/Makefile examples/Makefile fish/Makefile fuse/Makefile generator/Makefile gnulib/lib/Makefile gnulib/tests/Makefile haskell/Makefile images/Makefile inspector/Makefile java/Makefile java/examples/Makefile libguestfs.pc ocaml/META ocaml/Makefile ocaml/examples/Makefile perl/Makefile perl/Makefile.PL perl/examples/Makefile php/Makefile po-docs/Makefile po-docs/ja/Makefile po-docs/uk/Makefile po/Makefile.in python/Makefile python/examples/Makefile regressions/Makefile rescue/Makefile resize/Makefile ruby/Makefile ruby/Rakefile ruby/examples/Makefile src/Makefile test-tool/Makefile tools/Makefile"
+-ac_config_files="$ac_config_files Makefile align/Makefile appliance/Makefile capitests/Makefile cat/Makefile caution/Makefile clone/Makefile csharp/Makefile daemon/Makefile debian/changelog df/Makefile edit/Makefile erlang/Makefile erlang/examples/Makefile examples/Makefile fish/Makefile fuse/Makefile generator/Makefile gnulib/lib/Makefile gnulib/tests/Makefile haskell/Makefile images/Makefile inspector/Makefile java/Makefile java/examples/Makefile libguestfs.pc ocaml/META ocaml/Makefile ocaml/examples/Makefile perl/Makefile perl/Makefile.PL perl/examples/Makefile php/Makefile po-docs/Makefile po-docs/ja/Makefile po-docs/uk/Makefile po/Makefile.in python/Makefile python/examples/Makefile regressions/Makefile rescue/Makefile resize/Makefile ruby/Makefile ruby/Rakefile ruby/examples/Makefile sparsify/Makefile src/Makefile test-tool/Makefile tools/Makefile"
++ac_config_files="$ac_config_files Makefile align/Makefile appliance/Makefile capitests/Makefile cat/Makefile caution/Makefile clone/Makefile csharp/Makefile daemon/Makefile df/Makefile edit/Makefile erlang/Makefile erlang/examples/Makefile examples/Makefile fish/Makefile fuse/Makefile generator/Makefile gnulib/lib/Makefile gnulib/tests/Makefile haskell/Makefile images/Makefile inspector/Makefile java/Makefile java/examples/Makefile libguestfs.pc ocaml/META ocaml/Makefile ocaml/examples/Makefile perl/Makefile perl/Makefile.PL perl/examples/Makefile php/Makefile po-docs/Makefile po-docs/ja/Makefile po-docs/uk/Makefile po/Makefile.in python/Makefile python/examples/Makefile regressions/Makefile rescue/Makefile resize/Makefile ruby/Makefile ruby/Rakefile ruby/examples/Makefile sparsify/Makefile src/Makefile test-tool/Makefile tools/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -42497,7 +42509,6 @@ do
- "cat/Makefile") CONFIG_FILES="$CONFIG_FILES cat/Makefile" ;;
- "caution/Makefile") CONFIG_FILES="$CONFIG_FILES caution/Makefile" ;;
+@@ -53654,7 +53666,6 @@ do
+ "clone/Makefile") CONFIG_FILES="$CONFIG_FILES clone/Makefile" ;;
"csharp/Makefile") CONFIG_FILES="$CONFIG_FILES csharp/Makefile" ;;
+ "daemon/Makefile") CONFIG_FILES="$CONFIG_FILES daemon/Makefile" ;;
- "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
"df/Makefile") CONFIG_FILES="$CONFIG_FILES df/Makefile" ;;
"edit/Makefile") CONFIG_FILES="$CONFIG_FILES edit/Makefile" ;;
- "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
+ "erlang/Makefile") CONFIG_FILES="$CONFIG_FILES erlang/Makefile" ;;
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
-index ab188ca..fa13869 100644
+index 7e2f643..ce9fa4d 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
-@@ -3126,10 +3126,10 @@ $(generator_built): $(generatorsrcdir)/stamp-generator
- $(generatorsrcdir)/stamp-generator: force
- $(MAKE) -C $(generatorsrcdir) stamp-generator
+@@ -3107,10 +3107,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
@@ -486,10 +529,10 @@ index ab188ca..fa13869 100644
ln $< $@
$(libsrcdir)/guestfs_protocol.c: force
diff --git a/df/Makefile.in b/df/Makefile.in
-index 747089a..e484854 100644
+index 7558be5..acd57cb 100644
--- a/df/Makefile.in
+++ b/df/Makefile.in
-@@ -1184,7 +1184,7 @@ TESTS_ENVIRONMENT = \
+@@ -1313,7 +1313,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -499,10 +542,10 @@ index 747089a..e484854 100644
.SUFFIXES:
diff --git a/edit/Makefile.in b/edit/Makefile.in
-index a367f48..667f0bf 100644
+index 189f9c4..50e7052 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
-@@ -1173,7 +1173,7 @@ TESTS_ENVIRONMENT = \
+@@ -1302,7 +1302,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -512,10 +555,10 @@ index a367f48..667f0bf 100644
.SUFFIXES:
diff --git a/fuse/Makefile.in b/fuse/Makefile.in
-index 09c31d9..bd53845 100644
+index 61ef7f3..bef982b 100644
--- a/fuse/Makefile.in
+++ b/fuse/Makefile.in
-@@ -1180,7 +1180,7 @@ CLEANFILES = stamp-guestmount.pod
+@@ -1309,7 +1309,7 @@ CLEANFILES = stamp-guestmount.pod
@HAVE_FUSE_TRUE at noinst_DATA = $(top_builddir)/html/guestmount.1.html
# Tests.
@@ -524,24 +567,11 @@ index 09c31d9..bd53845 100644
@HAVE_FUSE_TRUE at TESTS_ENVIRONMENT = \
@HAVE_FUSE_TRUE@ top_builddir=..
-diff --git a/generator/Makefile.in b/generator/Makefile.in
-index d7dbc16..1120751 100644
---- a/generator/Makefile.in
-+++ b/generator/Makefile.in
-@@ -1445,7 +1445,7 @@ uninstall-am:
- # No OCaml compiler. Just replace the generator with a script that
- # touches stamp-generator and prints a warning.
-
-- at HAVE_OCAML_FALSE@generator: $(SOURCES)
-+ at HAVE_OCAML_FALSE@$(srcdir)/generator: $(SOURCES)
- @HAVE_OCAML_FALSE@ rm -f $@ $@-t
- @HAVE_OCAML_FALSE@ echo 'echo Warning: Install OCaml compiler in order to rebuild the generated files.' >> $@-t
- @HAVE_OCAML_FALSE@ echo 'touch generator/stamp-generator' >> $@-t
diff --git a/images/Makefile.in b/images/Makefile.in
-index 32654c4..35ed8ca 100644
+index 19f3346..c11b827 100644
--- a/images/Makefile.in
+++ b/images/Makefile.in
-@@ -1099,7 +1099,7 @@ noinst_DATA = test.iso
+@@ -1228,7 +1228,7 @@ noinst_DATA = test.iso
# This is 'check_DATA' because we don't need it until 'make check'
# time and we need the tools we have built in order to make it.
@@ -550,21 +580,8 @@ index 32654c4..35ed8ca 100644
CLEANFILES = \
test.iso test.sqsh \
100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
-diff --git a/inspector/Makefile.in b/inspector/Makefile.in
-index e5835bd..dcdb155 100644
---- a/inspector/Makefile.in
-+++ b/inspector/Makefile.in
-@@ -1196,7 +1196,7 @@ dist_doc_DATA = \
- @HAVE_LIBXML2_TRUE at man_MANS = virt-inspector.1
- @HAVE_LIBXML2_TRUE at noinst_DATA = $(top_builddir)/html/virt-inspector.1.html
- @HAVE_LIBXML2_TRUE@@HAVE_XMLLINT_TRUE at TESTS = $(EXAMPLE_XML)
-- at HAVE_LIBXML2_TRUE@@HAVE_XMLLINT_TRUE at TESTS_ENVIRONMENT = $(XMLLINT) --noout --relaxng virt-inspector.rng
-+ at HAVE_LIBXML2_TRUE@@HAVE_XMLLINT_TRUE at TESTS_ENVIRONMENT = $(XMLLINT) --noout --relaxng $(srcdir)/virt-inspector.rng
- all: all-am
-
- .SUFFIXES:
diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
-index db915b5..ea6ca82 100644
+index e21dfcb..7a80668 100644
--- a/ocaml/Makefile.in
+++ b/ocaml/Makefile.in
@@ -71,7 +71,11 @@ DIST_COMMON = $(srcdir)/.depend $(srcdir)/META.in \
@@ -580,7 +597,7 @@ index db915b5..ea6ca82 100644
subdir = ocaml
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1084,7 +1088,7 @@ EXTRA_DIST = \
+@@ -1213,7 +1217,7 @@ EXTRA_DIST = \
t/*.ml
CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so t/*.cmi \
@@ -589,7 +606,7 @@ index db915b5..ea6ca82 100644
AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
-I$(top_srcdir)/src -I$(top_builddir)/src \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
-@@ -1102,14 +1106,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
+@@ -1231,14 +1235,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_OCAML_TRUE@ $(VG)
@@ -608,7 +625,7 @@ index db915b5..ea6ca82 100644
all: all-am
diff --git a/perl/Makefile.in b/perl/Makefile.in
-index a1186ff..79dd8c4 100644
+index f8232d3..12444e8 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -68,6 +68,8 @@ build_triplet = @build@
@@ -620,7 +637,7 @@ index a1186ff..79dd8c4 100644
subdir = perl
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1080,7 +1082,8 @@ EXTRA_DIST = \
+@@ -1209,7 +1211,8 @@ EXTRA_DIST = \
t/*.t \
typemap
@@ -630,7 +647,7 @@ index a1186ff..79dd8c4 100644
@HAVE_PERL_TRUE at TESTS_ENVIRONMENT = \
@HAVE_PERL_TRUE@ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
@HAVE_PERL_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
-@@ -1405,12 +1408,13 @@ appliance: force
+@@ -1534,12 +1537,13 @@ appliance: force
@HAVE_PERL_TRUE at test_images:
@HAVE_PERL_TRUE@ $(MAKE) -C $(top_builddir)/images
@@ -646,7 +663,7 @@ index a1186ff..79dd8c4 100644
# No! Otherwise it is deleted before the clean-local rule runs.
diff --git a/python/Makefile.in b/python/Makefile.in
-index 1e73bf1..97948c8 100644
+index d3cd517..43078d3 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -70,6 +70,7 @@ build_triplet = @build@
@@ -657,14 +674,7 @@ index 1e73bf1..97948c8 100644
subdir = python
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1146,13 +1147,13 @@ EXTRA_DIST = \
- @HAVE_PYTHON_TRUE@ -I$(top_srcdir)/src -I$(top_builddir)/src
-
- @HAVE_PYTHON_TRUE at libguestfsmod_la_LIBADD = $(top_builddir)/src/libguestfs.la
-- at HAVE_PYTHON_TRUE@libguestfsmod_la_LDFLAGS = -avoid-version
-+ at HAVE_PYTHON_TRUE@libguestfsmod_la_LDFLAGS = -avoid-version -shared
- @HAVE_PYTHON_TRUE at TESTS_ENVIRONMENT = \
- @HAVE_PYTHON_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+@@ -1281,7 +1282,7 @@ EXTRA_DIST = \
@HAVE_PYTHON_TRUE@ PYTHONPATH=$(builddir):$(builddir)/.libs \
@HAVE_PYTHON_TRUE@ TMPDIR=$(top_builddir)
@@ -674,10 +684,28 @@ index 1e73bf1..97948c8 100644
.SUFFIXES:
diff --git a/resize/Makefile.in b/resize/Makefile.in
-index 8b17ff9..b848eb4 100644
+index 9960a31..d00ecd9 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
-@@ -1135,7 +1135,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+@@ -1241,7 +1241,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+
+ # Note this list must be in dependency order.
+ @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at OBJECTS = \
+- at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ ../fish/guestfish-progress.o \
++ at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ $(top_builddir)/fish/guestfish-progress.o \
+ @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ progress_c.o \
+ @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ utils.cmx \
+ @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ progress.cmx \
+@@ -1258,7 +1258,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+
+ # automake will decide we don't need C support in this file. Really
+ # we do, so we have to provide it ourselves.
+- at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I../fish
++ at HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I$(top_srcdir)/fish
+
+ # Manual pages and HTML files for the website.
+ @HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE at man_MANS = virt-resize.1
+@@ -1272,7 +1272,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
@HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
@HAVE_OCAML_PCRE_TRUE@@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir)
@@ -686,11 +714,49 @@ index 8b17ff9..b848eb4 100644
all: all-am
.SUFFIXES:
+diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
+index 21c8e80..bcbd0a9 100644
+--- a/sparsify/Makefile.in
++++ b/sparsify/Makefile.in
+@@ -1241,7 +1241,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+
+ # Note this list must be in dependency order.
+ @HAVE_OCAML_TRUE at OBJECTS = \
+- at HAVE_OCAML_TRUE@ ../fish/guestfish-progress.o \
++ at HAVE_OCAML_TRUE@ $(top_builddir)/fish/guestfish-progress.o \
+ @HAVE_OCAML_TRUE@ progress_c.o \
+ @HAVE_OCAML_TRUE@ utils.cmx \
+ @HAVE_OCAML_TRUE@ progress.cmx \
+@@ -1252,13 +1252,13 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+ # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L
+ # option to be passed to gcc, so we don't try linking against an
+ # installed copy of libguestfs.
+- at HAVE_OCAML_TRUE@OCAMLPACKAGES = -package unix -I $(top_builddir)/src/.libs -I ../ocaml
++ at HAVE_OCAML_TRUE@OCAMLPACKAGES = -package unix -I $(top_builddir)/src/.libs -I $(top_builddir)/ocaml
+ @HAVE_OCAML_TRUE at OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX $(OCAMLPACKAGES)
+ @HAVE_OCAML_TRUE at OCAMLOPTFLAGS = $(OCAMLCFLAGS)
+
+ # automake will decide we don't need C support in this file. Really
+ # we do, so we have to provide it ourselves.
+- at HAVE_OCAML_TRUE@DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I../fish
++ at HAVE_OCAML_TRUE@DEFAULT_INCLUDES = -I. -I$(top_builddir) -I$(shell $(OCAMLC) -where) -I$(top_srcdir)/fish
+
+ # Manual pages and HTML files for the website.
+ @HAVE_OCAML_TRUE at man_MANS = virt-sparsify.1
+@@ -1272,7 +1272,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+ @HAVE_OCAML_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
+ @HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir)
+
+- at HAVE_OCAML_TRUE@TESTS = test-virt-sparsify.sh
++ at ENABLE_APPLIANCE_TRUE@@HAVE_OCAML_TRUE at TESTS = test-virt-sparsify.sh
+ all: all-am
+
+ .SUFFIXES:
diff --git a/tools/Makefile.in b/tools/Makefile.in
-index 7bb6d49..0e2bd8f 100644
+index 3d20041..d727faa 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
-@@ -1123,9 +1123,9 @@ CLEANFILES = test.img
+@@ -1252,9 +1252,9 @@ CLEANFILES = test.img
@HAVE_TOOLS_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_TOOLS_TRUE@ PERL5LIB=$(top_builddir)/perl/blib/lib:$(top_builddir)/perl/blib/arch
diff --git a/debian/patches/0011-out-of-tree-build-fix-HAVE_OCAML-false-case.patch b/debian/patches/0011-out-of-tree-build-fix-HAVE_OCAML-false-case.patch
deleted file mode 100644
index a208e8a..0000000
--- a/debian/patches/0011-out-of-tree-build-fix-HAVE_OCAML-false-case.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Wed, 19 Oct 2011 21:41:12 +0200
-Subject: out-of-tree build: fix HAVE_OCAML=false case
-
----
- generator/Makefile.am | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/generator/Makefile.am b/generator/Makefile.am
-index a127a87..b967a0b 100644
---- a/generator/Makefile.am
-+++ b/generator/Makefile.am
-@@ -85,7 +85,7 @@ else
- # No OCaml compiler. Just replace the generator with a script that
- # touches stamp-generator and prints a warning.
-
--generator: $(SOURCES)
-+$(srcdir)/generator: $(SOURCES)
- rm -f $@ $@-t
- echo 'echo Warning: Install OCaml compiler in order to rebuild the generated files.' >> $@-t
- echo 'touch generator/stamp-generator' >> $@-t
---
diff --git a/debian/patches/0012-out-of-tree-build-fixed-bindtests-and-inspector.patch b/debian/patches/0012-out-of-tree-build-fixed-bindtests-and-inspector.patch
deleted file mode 100644
index 5319d54..0000000
--- a/debian/patches/0012-out-of-tree-build-fixed-bindtests-and-inspector.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Thu, 20 Oct 2011 01:09:11 +0200
-Subject: out-of-tree build: fixed bindtests and inspector
-
----
- haskell/run-bindtests | 3 ++-
- inspector/Makefile.am | 2 +-
- java/run-bindtests | 2 +-
- ocaml/run-bindtests | 2 +-
- perl/run-bindtests | 2 +-
- python/run-bindtests | 5 +++--
- ruby/run-bindtests | 2 +-
- 7 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/haskell/run-bindtests b/haskell/run-bindtests
-index f9ea434..85b8048 100755
---- a/haskell/run-bindtests
-+++ b/haskell/run-bindtests
-@@ -19,4 +19,5 @@
- set -e
-
- ./Bindtests > bindtests.tmp
--diff -u ../bindtests bindtests.tmp
-+diff -u ${srcdir}/../bindtests bindtests.tmp
-+
-diff --git a/inspector/Makefile.am b/inspector/Makefile.am
-index 03e13d8..2389dbd 100644
---- a/inspector/Makefile.am
-+++ b/inspector/Makefile.am
-@@ -90,7 +90,7 @@ stamp-virt-inspector.pod: virt-inspector.pod
- if HAVE_XMLLINT
-
- TESTS = $(EXAMPLE_XML)
--TESTS_ENVIRONMENT = $(XMLLINT) --noout --relaxng virt-inspector.rng
-+TESTS_ENVIRONMENT = $(XMLLINT) --noout --relaxng $(srcdir)/virt-inspector.rng
-
- endif
-
-diff --git a/java/run-bindtests b/java/run-bindtests
-index b80c4dc..7e6eb7f 100755
---- a/java/run-bindtests
-+++ b/java/run-bindtests
-@@ -19,4 +19,4 @@
- set -e
-
- $JAVA -Djava.library.path=.libs Bindtests > bindtests.tmp
--diff -u ../bindtests bindtests.tmp
-+diff -u ${srcdir}/../bindtests bindtests.tmp
-diff --git a/ocaml/run-bindtests b/ocaml/run-bindtests
-index 5200fec..d9a3047 100755
---- a/ocaml/run-bindtests
-+++ b/ocaml/run-bindtests
-@@ -19,4 +19,4 @@
- set -e
-
- ./bindtests > bindtests.tmp
--diff -u ../bindtests bindtests.tmp
-+diff -u ${srcdir}/../bindtests bindtests.tmp
-diff --git a/perl/run-bindtests b/perl/run-bindtests
-index d9d1ca3..f9cf231 100755
---- a/perl/run-bindtests
-+++ b/perl/run-bindtests
-@@ -20,4 +20,4 @@ set -e
-
- export PERL5LIB=$(pwd)/blib/lib:$(pwd)/blib/arch
- perl bindtests.pl > bindtests.tmp
--diff -u ../bindtests bindtests.tmp
-+diff -u ${srcdir}/../bindtests bindtests.tmp
-diff --git a/python/run-bindtests b/python/run-bindtests
-index 17448c3..070c90c 100755
---- a/python/run-bindtests
-+++ b/python/run-bindtests
-@@ -18,5 +18,6 @@
-
- set -e
-
--python bindtests.py > bindtests.tmp
--diff -u ../bindtests bindtests.tmp
-+python ${srcdir}/bindtests.py > bindtests.tmp
-+diff -u ${srcdir}/../bindtests bindtests.tmp
-+
-diff --git a/ruby/run-bindtests b/ruby/run-bindtests
-index 803d4c6..3bfa226 100755
---- a/ruby/run-bindtests
-+++ b/ruby/run-bindtests
-@@ -19,4 +19,4 @@
- set -e
-
- ruby -Ilib -Iext/guestfs bindtests.rb > bindtests.tmp
--diff -u ../bindtests bindtests.tmp
-+diff -u ${srcdir}/../bindtests bindtests.tmp
---
diff --git a/debian/patches/0014-Added-fix-for-qemu-0.15-machine-option.patch b/debian/patches/0014-Added-fix-for-qemu-0.15-machine-option.patch
deleted file mode 100644
index 66a4f72..0000000
--- a/debian/patches/0014-Added-fix-for-qemu-0.15-machine-option.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Mon, 24 Oct 2011 12:35:45 +0200
-Subject: Added fix for qemu 0.15 machine option.
-
-Source: <http://pkgs.fedoraproject.org/gitweb/?p=libguestfs.git;a=blob;f=0001-Fix-qemu-machine-option-for-latest-qemu-thanks-Marku.patch;h=71347b9daf8e9fabfd13e04e2b01064f14ef9d8a;hb=HEAD>
----
- src/launch.c | 25 +++++++++++++++----------
- 1 files changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/src/launch.c b/src/launch.c
-index ae1e100..cf11ec4 100644
---- a/src/launch.c
-+++ b/src/launch.c
-@@ -76,10 +76,10 @@ static int64_t timeval_diff (const struct timeval *x, const struct timeval *y);
- static void print_qemu_command_line (guestfs_h *g, char **argv);
- static int connect_unix_socket (guestfs_h *g, const char *sock);
- static int qemu_supports (guestfs_h *g, const char *option);
--
--#if 0
- static int qemu_supports_re (guestfs_h *g, const pcre *option_regex);
-
-+static pcre *re_machine_name;
-+
- static void compile_regexps (void) __attribute__((constructor));
- static void free_regexps (void) __attribute__((destructor));
-
-@@ -97,13 +97,15 @@ compile_regexps (void)
- abort (); \
- } \
- } while (0)
-+
-+ COMPILE (re_machine_name, "-machine .*\\bname\\b", 0);
- }
-
- static void
- free_regexps (void)
- {
-+ pcre_free (re_machine_name);
- }
--#endif
-
- /* Functions to add a string to the current command line. */
- static void
-@@ -524,14 +526,19 @@ launch_appliance (guestfs_h *g)
- if (qemu_supports (g, "-nodefconfig"))
- add_cmdline (g, "-nodefconfig");
-
-- /* The qemu -machine option (added 2010-12) is a bit more sane
-- * since it falls back through various different acceleration
-- * modes, so try that first (thanks Markus Armbruster).
-+ /* The qemu -machine option (added 2010-12) falls back through
-+ * various different acceleration modes, so try that first (thanks
-+ * Markus Armbruster). However in qemu commit 9052ea6bf4962b13
-+ * the syntax was changed, so we have to detect that.
- */
-- if (qemu_supports (g, "-machine")) {
-+ if (qemu_supports_re (g, re_machine_name)) { /* after 2011-07-23 */
-+ add_cmdline (g, "-machine");
-+ add_cmdline (g, "pc,accel=kvm:tcg");
-+ }
-+ else if (qemu_supports (g, "-machine")) { /* after 2010-12 */
- add_cmdline (g, "-machine");
- add_cmdline (g, "accel=kvm:tcg");
-- } else {
-+ } else { /* no -machine option */
- /* qemu sometimes needs this option to enable hardware
- * virtualization, but some versions of 'qemu-kvm' will use KVM
- * regardless (even where this option appears in the help text).
-@@ -1173,7 +1180,6 @@ qemu_supports (guestfs_h *g, const char *option)
- return strstr (g->qemu_help, option) != NULL;
- }
-
--#if 0
- /* As above but using a regex instead of a fixed string. */
- static int
- qemu_supports_re (guestfs_h *g, const pcre *option_regex)
-@@ -1185,7 +1191,6 @@ qemu_supports_re (guestfs_h *g, const pcre *option_regex)
-
- return match (g, g->qemu_help, option_regex);
- }
--#endif
-
- /* Check if a file can be opened. */
- static int
---
diff --git a/debian/patches/series b/debian/patches/series
index 5aaa482..b39e30e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,11 @@
0001-Disable-fuse-tests-if-dev-fuse-doesn-t-exist.patch
0002-Mount-run-as-tmpfs-inside-appliance-workaround-for-f.patch
-0003-disable-apparently-broken-getlogin_r-test-from-gnuli.patch
-0004-configure.ac-do-not-generate-debian-changelog.patch
-0005-Do-not-run-appliance-related-checks-if-not-building-.patch
-0006-check-for-febootstrap-etc.-even-if-not-building-appl.patch
-0007-python-don-t-build-static-library.patch
-0008-Fix-for-systemd-based-Debian-systems.patch
-0009-out-of-tree-build-fix-building-Perl-bindings.patch
-0010-out-of-tree-build-daemon.patch
-0011-out-of-tree-build-fix-HAVE_OCAML-false-case.patch
-0012-out-of-tree-build-fixed-bindtests-and-inspector.patch
-0013-autoreconf.patch
-0014-Added-fix-for-qemu-0.15-machine-option.patch
+0003-configure.ac-do-not-generate-debian-changelog.patch
+0004-Do-not-run-appliance-related-checks-if-not-building-.patch
+0005-check-for-febootstrap-etc.-even-if-not-building-appl.patch
+0006-Fix-for-systemd-based-Debian-systems.patch
+0007-out-of-tree-build-fix-building-Perl-bindings.patch
+0008-out-of-tree-build-daemon.patch
+0009-Fix-en-dis-able-install-daemon.patch
+0010-Fix-include.patch
+0011-autoreconf.patch
--
Libguestfs Debian packaging
More information about the Pkg-libvirt-commits
mailing list