[Pkg-libvirt-commits] [libguestfs] 03/06: Rebased patch queue
Hilko Bengen
bengen at moszumanska.debian.org
Sun Dec 22 18:13:54 UTC 2013
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to annotated tag debian/1%1.15.11-1
in repository libguestfs.
commit 797c8263f123891b1f613702c3cd87bb259682ae
Author: Hilko Bengen <bengen at debian.org>
Date: Sun Dec 11 18:57:23 2011 +0100
Rebased patch queue
---
.../patches/0012-ruby-install-to-vendor_ruby.patch | 16 +-
...0014-autoreconf.patch => 0013-autoreconf.patch} | 836 +++------------------
...BY-variable-for-specifying-the-correct-ve.patch | 91 ---
debian/patches/series | 3 +-
4 files changed, 110 insertions(+), 836 deletions(-)
diff --git a/debian/patches/0012-ruby-install-to-vendor_ruby.patch b/debian/patches/0012-ruby-install-to-vendor_ruby.patch
index 61fbf52..bc87b41 100644
--- a/debian/patches/0012-ruby-install-to-vendor_ruby.patch
+++ b/debian/patches/0012-ruby-install-to-vendor_ruby.patch
@@ -7,17 +7,17 @@ Subject: ruby: install to vendor_ruby.
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
-index 757855a..c68cd4a 100644
+index 8139140..97b2383 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
-@@ -55,13 +55,13 @@ all: $(generator_built)
- rake build
- rake rdoc
+@@ -56,13 +56,13 @@ all: $(generator_built)
+ $(RAKE) build
+ $(RAKE) rdoc
--RUBY_SITELIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
--RUBY_SITEARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-+RUBY_VENDORLIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
-+RUBY_VENDORARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
+-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
++RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
++RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
install:
- $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
diff --git a/debian/patches/0014-autoreconf.patch b/debian/patches/0013-autoreconf.patch
similarity index 59%
rename from debian/patches/0014-autoreconf.patch
rename to debian/patches/0013-autoreconf.patch
index 0470a3e..0b47859 100644
--- a/debian/patches/0014-autoreconf.patch
+++ b/debian/patches/0013-autoreconf.patch
@@ -3,56 +3,29 @@ Date: Sat, 20 Aug 2011 20:43:22 +0200
Subject: autoreconf
---
- Makefile.in | 51 +++++------
- aclocal.m4 | 14 ++--
- align/Makefile.in | 1 +
- appliance/Makefile.in | 1 +
- capitests/Makefile.in | 1 +
- cat/Makefile.in | 3 +-
- caution/Makefile.in | 1 +
- clone/Makefile.in | 3 +-
- configure | 205 +++++++++++++++++++++++++++----------------
- csharp/Makefile.in | 1 +
- daemon/Makefile.in | 5 +-
- df/Makefile.in | 3 +-
- edit/Makefile.in | 3 +-
- erlang/Makefile.in | 1 +
- erlang/examples/Makefile.in | 1 +
- examples/Makefile.in | 1 +
- extratests/Makefile.in | 1 +
- fish/Makefile.in | 1 +
- fuse/Makefile.in | 3 +-
- generator/Makefile.in | 1 +
- gnulib/lib/Makefile.in | 1 +
- gnulib/tests/Makefile.in | 1 +
- haskell/Makefile.in | 4 +-
- images/Makefile.in | 3 +-
- inspector/Makefile.in | 1 +
- java/Makefile.in | 6 +-
- java/examples/Makefile.in | 1 +
- ocaml/Makefile.in | 20 ++--
- ocaml/examples/Makefile.in | 1 +
- perl/Makefile.in | 9 ++-
- perl/examples/Makefile.in | 1 +
- php/Makefile.in | 1 +
- po-docs/Makefile.in | 1 +
- po-docs/ja/Makefile.in | 1 +
- po-docs/uk/Makefile.in | 1 +
- python/Makefile.in | 4 +-
- python/examples/Makefile.in | 1 +
- regressions/Makefile.in | 1 +
- rescue/Makefile.in | 1 +
- resize/Makefile.in | 8 +-
- ruby/Makefile.in | 20 +++--
- ruby/examples/Makefile.in | 1 +
- sparsify/Makefile.in | 9 +-
- src/Makefile.in | 1 +
- test-tool/Makefile.in | 1 +
- tools/Makefile.in | 7 +-
- 46 files changed, 256 insertions(+), 151 deletions(-)
+ Makefile.in | 50 ++++++++++++-------------
+ aclocal.m4 | 14 ++++---
+ cat/Makefile.in | 2 +-
+ clone/Makefile.in | 2 +-
+ configure | 97 ++++++++++++++++++++++++++++---------------------
+ daemon/Makefile.in | 4 +-
+ df/Makefile.in | 2 +-
+ edit/Makefile.in | 2 +-
+ fuse/Makefile.in | 2 +-
+ haskell/Makefile.in | 3 +-
+ images/Makefile.in | 2 +-
+ java/Makefile.in | 5 ++-
+ ocaml/Makefile.in | 19 +++++-----
+ perl/Makefile.in | 8 +++-
+ python/Makefile.in | 3 +-
+ resize/Makefile.in | 7 ++--
+ ruby/Makefile.in | 12 +++---
+ sparsify/Makefile.in | 8 ++--
+ tools/Makefile.in | 6 ++--
+ 19 files changed, 134 insertions(+), 114 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index c07b72f..3fd9268 100644
+index c40c362..3fd9268 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,6 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -131,15 +104,7 @@ index c07b72f..3fd9268 100644
erlang/examples csharp resize sparsify tools fuse clone \
po-docs
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -1217,6 +1217,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1322,12 +1323,12 @@ ACLOCAL_AMFLAGS = -I m4
+@@ -1323,12 +1323,12 @@ ACLOCAL_AMFLAGS = -I m4
# Unconditional because nothing is built yet.
SUBDIRS = gnulib/lib images generator src examples po $(am__append_1) \
@@ -158,7 +123,7 @@ index c07b72f..3fd9268 100644
EXTRA_DIST = \
$(generator_built) \
BUGS HACKING RELEASE-NOTES ROADMAP TODO \
-@@ -1495,8 +1496,6 @@ podwrapper.sh: $(top_builddir)/config.status $(srcdir)/podwrapper.sh.in
+@@ -1496,8 +1496,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 $@
@@ -221,55 +186,11 @@ index 44c3f1c..01d9587 100644
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-diff --git a/align/Makefile.in b/align/Makefile.in
-index 0a48a3b..ae53fc5 100644
---- a/align/Makefile.in
-+++ b/align/Makefile.in
-@@ -1172,6 +1172,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/appliance/Makefile.in b/appliance/Makefile.in
-index 01c2024..9723600 100644
---- a/appliance/Makefile.in
-+++ b/appliance/Makefile.in
-@@ -1125,6 +1125,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/capitests/Makefile.in b/capitests/Makefile.in
-index 41eabd3..4431124 100644
---- a/capitests/Makefile.in
-+++ b/capitests/Makefile.in
-@@ -1221,6 +1221,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/cat/Makefile.in b/cat/Makefile.in
-index 2c3e3c6..9f6c814 100644
+index 6bcc62e..9f6c814 100644
--- a/cat/Makefile.in
+++ b/cat/Makefile.in
-@@ -1196,6 +1196,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1377,7 +1378,7 @@ TESTS_ENVIRONMENT = \
+@@ -1378,7 +1378,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -278,31 +199,11 @@ index 2c3e3c6..9f6c814 100644
all: all-am
.SUFFIXES:
-diff --git a/caution/Makefile.in b/caution/Makefile.in
-index f3942ad..a14a86c 100644
---- a/caution/Makefile.in
-+++ b/caution/Makefile.in
-@@ -1108,6 +1108,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/clone/Makefile.in b/clone/Makefile.in
-index a20d120..2fcacf4 100644
+index 5c3f5b3..2fcacf4 100644
--- a/clone/Makefile.in
+++ b/clone/Makefile.in
-@@ -1132,6 +1132,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1244,7 +1245,7 @@ TESTS_ENVIRONMENT = \
+@@ -1245,7 +1245,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -312,18 +213,10 @@ index a20d120..2fcacf4 100644
.SUFFIXES:
diff --git a/configure b/configure
-index b51d13b..a0c968e 100755
+index f948dd0..25be5db 100755
--- a/configure
+++ b/configure
-@@ -657,6 +657,7 @@ JAVA_HOME
- HAVE_RUBY_FALSE
- HAVE_RUBY_TRUE
- RAKE
-+RUBY
- HAVE_PYTHON_FALSE
- HAVE_PYTHON_TRUE
- PYTHON_INSTALLDIR
-@@ -45147,7 +45148,10 @@ else
+@@ -45148,7 +45148,10 @@ else
enable_install_daemon=no
fi
@@ -335,7 +228,7 @@ index b51d13b..a0c968e 100755
INSTALL_DAEMON_TRUE=
INSTALL_DAEMON_FALSE='#'
else
-@@ -45155,9 +45159,6 @@ else
+@@ -45156,9 +45159,6 @@ else
INSTALL_DAEMON_FALSE=
fi
@@ -345,7 +238,7 @@ index b51d13b..a0c968e 100755
{ $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; }
-@@ -45179,8 +45180,7 @@ fi
+@@ -45180,8 +45180,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_appliance" >&5
$as_echo "$enable_appliance" >&6; }
@@ -355,7 +248,7 @@ index b51d13b..a0c968e 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; }
-@@ -45218,12 +45218,8 @@ $as_echo "no" >&6; }
+@@ -45219,12 +45218,8 @@ $as_echo "no" >&6; }
fi
@@ -369,7 +262,7 @@ index b51d13b..a0c968e 100755
$as_echo_n "checking if user requested febootstrap --yum-config option... " >&6; }
# Check whether --with-febootstrap-yum-config was given.
-@@ -45233,26 +45229,32 @@ else
+@@ -45234,26 +45229,32 @@ else
FEBOOTSTRAP_YUM_CONFIG=no
fi
@@ -415,7 +308,7 @@ index b51d13b..a0c968e 100755
# Extract the first word of "rpcgen", so it can be a program name with args.
set dummy rpcgen; ac_word=$2
-@@ -45411,6 +45413,7 @@ fi
+@@ -45412,6 +45413,7 @@ fi
@@ -423,7 +316,7 @@ index b51d13b..a0c968e 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.
-@@ -45539,6 +45542,7 @@ if test -n "$AUGEAS_CFLAGS"; then
+@@ -45540,6 +45542,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`
@@ -431,7 +324,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -45555,6 +45559,7 @@ if test -n "$AUGEAS_LIBS"; then
+@@ -45556,6 +45559,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`
@@ -439,7 +332,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -45574,9 +45579,9 @@ else
+@@ -45575,9 +45579,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -451,7 +344,7 @@ index b51d13b..a0c968e 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$AUGEAS_PKG_ERRORS" >&5
-@@ -48248,6 +48253,7 @@ if test -n "$PCRE_CFLAGS"; then
+@@ -48249,6 +48253,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`
@@ -459,7 +352,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48264,6 +48270,7 @@ if test -n "$PCRE_LIBS"; then
+@@ -48265,6 +48270,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`
@@ -467,7 +360,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48283,9 +48290,9 @@ else
+@@ -48284,9 +48290,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -479,7 +372,7 @@ index b51d13b..a0c968e 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$PCRE_PKG_ERRORS" >&5
-@@ -48300,7 +48307,6 @@ installed software in a non-standard prefix.
+@@ -48301,7 +48307,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
@@ -487,7 +380,7 @@ index b51d13b..a0c968e 100755
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -48316,7 +48322,6 @@ See the pkg-config man page for more details.
+@@ -48317,7 +48322,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; }
@@ -495,7 +388,7 @@ index b51d13b..a0c968e 100755
else
PCRE_CFLAGS=$pkg_cv_PCRE_CFLAGS
PCRE_LIBS=$pkg_cv_PCRE_LIBS
-@@ -48395,6 +48400,7 @@ if test -n "$LIBVIRT_CFLAGS"; then
+@@ -48396,6 +48400,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`
@@ -503,7 +396,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48411,6 +48417,7 @@ if test -n "$LIBVIRT_LIBS"; then
+@@ -48412,6 +48417,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`
@@ -511,7 +404,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48430,9 +48437,9 @@ else
+@@ -48431,9 +48437,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -523,7 +416,7 @@ index b51d13b..a0c968e 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBVIRT_PKG_ERRORS" >&5
-@@ -48480,6 +48487,7 @@ if test -n "$LIBXML2_CFLAGS"; then
+@@ -48481,6 +48487,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`
@@ -531,7 +424,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48496,6 +48504,7 @@ if test -n "$LIBXML2_LIBS"; then
+@@ -48497,6 +48504,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`
@@ -539,7 +432,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48515,9 +48524,9 @@ else
+@@ -48516,9 +48524,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -551,7 +444,7 @@ index b51d13b..a0c968e 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBXML2_PKG_ERRORS" >&5
-@@ -48565,6 +48574,7 @@ if test -n "$LIBCONFIG_CFLAGS"; then
+@@ -48566,6 +48574,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`
@@ -559,7 +452,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48581,6 +48591,7 @@ if test -n "$LIBCONFIG_LIBS"; then
+@@ -48582,6 +48591,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`
@@ -567,7 +460,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48600,9 +48611,9 @@ else
+@@ -48601,9 +48611,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -579,7 +472,7 @@ index b51d13b..a0c968e 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBCONFIG_PKG_ERRORS" >&5
-@@ -48650,6 +48661,7 @@ if test -n "$HIVEX_CFLAGS"; then
+@@ -48651,6 +48661,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`
@@ -587,7 +480,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48666,6 +48678,7 @@ if test -n "$HIVEX_LIBS"; then
+@@ -48667,6 +48678,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`
@@ -595,7 +488,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48685,9 +48698,9 @@ else
+@@ -48686,9 +48698,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -607,7 +500,7 @@ index b51d13b..a0c968e 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$HIVEX_PKG_ERRORS" >&5
-@@ -48743,6 +48756,7 @@ if test -n "$FUSE_CFLAGS"; then
+@@ -48744,6 +48756,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`
@@ -615,7 +508,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48759,6 +48773,7 @@ if test -n "$FUSE_LIBS"; then
+@@ -48760,6 +48773,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`
@@ -623,7 +516,7 @@ index b51d13b..a0c968e 100755
else
pkg_failed=yes
fi
-@@ -48778,9 +48793,9 @@ else
+@@ -48779,9 +48793,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -635,136 +528,7 @@ index b51d13b..a0c968e 100755
fi
# Put the nasty error message in config.log where it belongs
echo "$FUSE_PKG_ERRORS" >&5
-@@ -50116,48 +50131,44 @@ fi
-
- if test "x$enable_ruby" != "xno"; then :
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby_init in -lruby" >&5
--$as_echo_n "checking for ruby_init in -lruby... " >&6; }
--if ${ac_cv_lib_ruby_ruby_init+:} false; then :
-+ # Extract the first word of "ruby", so it can be a program name with args.
-+set dummy ruby; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_RUBY+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lruby $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char ruby_init ();
--int
--main ()
--{
--return ruby_init ();
-- ;
-- return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
-- ac_cv_lib_ruby_ruby_init=yes
-+ if test -n "$RUBY"; then
-+ ac_cv_prog_RUBY="$RUBY" # Let the user override the test.
- else
-- ac_cv_lib_ruby_ruby_init=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_prog_RUBY" && ac_cv_prog_RUBY="no"
- fi
--rm -f core conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ruby_ruby_init" >&5
--$as_echo "$ac_cv_lib_ruby_ruby_init" >&6; }
--if test "x$ac_cv_lib_ruby_ruby_init" = xyes; then :
-- HAVE_LIBRUBY=1
-+RUBY=$ac_cv_prog_RUBY
-+if test -n "$RUBY"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY" >&5
-+$as_echo "$RUBY" >&6; }
- else
-- HAVE_LIBRUBY=0
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
-
-+
- # Extract the first word of "rake", so it can be a program name with args.
- set dummy rake; ac_word=$2
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-@@ -50196,6 +50207,49 @@ $as_echo "no" >&6; }
- fi
-
-
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ruby_init in -lruby" >&5
-+$as_echo_n "checking for ruby_init in -lruby... " >&6; }
-+if ${ac_cv_lib_ruby_ruby_init+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lruby $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char ruby_init ();
-+int
-+main ()
-+{
-+return ruby_init ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_ruby_ruby_init=yes
-+else
-+ ac_cv_lib_ruby_ruby_init=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ruby_ruby_init" >&5
-+$as_echo "$ac_cv_lib_ruby_ruby_init" >&6; }
-+if test "x$ac_cv_lib_ruby_ruby_init" = xyes; then :
-+ HAVE_LIBRUBY=1
-+else
-+ HAVE_LIBRUBY=0
-+fi
-+
-+
-
- fi
- if test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"; then
-@@ -51162,7 +51216,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
+@@ -51202,7 +51216,7 @@ ac_config_files="$ac_config_files podwrapper.sh"
ac_config_files="$ac_config_files run"
@@ -773,7 +537,7 @@ index b51d13b..a0c968e 100755
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -52376,7 +52430,6 @@ do
+@@ -52416,7 +52430,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" ;;
@@ -781,31 +545,11 @@ index b51d13b..a0c968e 100755
"df/Makefile") CONFIG_FILES="$CONFIG_FILES df/Makefile" ;;
"edit/Makefile") CONFIG_FILES="$CONFIG_FILES edit/Makefile" ;;
"erlang/Makefile") CONFIG_FILES="$CONFIG_FILES erlang/Makefile" ;;
-diff --git a/csharp/Makefile.in b/csharp/Makefile.in
-index 0563335..b753324 100644
---- a/csharp/Makefile.in
-+++ b/csharp/Makefile.in
-@@ -1101,6 +1101,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
-index 3b4126a..d55a9d0 100644
+index d15fc8d..d55a9d0 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
-@@ -1199,6 +1199,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -3130,10 +3131,10 @@ $(top_builddir)/daemon/guestfsd: force
+@@ -3131,10 +3131,10 @@ $(top_builddir)/daemon/guestfsd: force
appliance: force
$(MAKE) -C $(top_builddir)/appliance
@@ -819,18 +563,10 @@ index 3b4126a..d55a9d0 100644
ln $< $@
$(libsrcdir)/guestfs_protocol.c: force
diff --git a/df/Makefile.in b/df/Makefile.in
-index 66514a7..65af300 100644
+index 5295978..65af300 100644
--- a/df/Makefile.in
+++ b/df/Makefile.in
-@@ -1172,6 +1172,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1317,7 +1318,7 @@ TESTS_ENVIRONMENT = \
+@@ -1318,7 +1318,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -840,18 +576,10 @@ index 66514a7..65af300 100644
.SUFFIXES:
diff --git a/edit/Makefile.in b/edit/Makefile.in
-index 9fe322c..fee9e78 100644
+index 2ca79f7..fee9e78 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
-@@ -1169,6 +1169,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1306,7 +1307,7 @@ TESTS_ENVIRONMENT = \
+@@ -1307,7 +1307,7 @@ TESTS_ENVIRONMENT = \
LIBGUESTFS_PATH=$(top_builddir)/appliance \
TMPDIR=$(top_builddir)
@@ -860,79 +588,11 @@ index 9fe322c..fee9e78 100644
all: all-am
.SUFFIXES:
-diff --git a/erlang/Makefile.in b/erlang/Makefile.in
-index 940c4f8..f08091a 100644
---- a/erlang/Makefile.in
-+++ b/erlang/Makefile.in
-@@ -1165,6 +1165,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/erlang/examples/Makefile.in b/erlang/examples/Makefile.in
-index 58f79fd..bebd4dd 100644
---- a/erlang/examples/Makefile.in
-+++ b/erlang/examples/Makefile.in
-@@ -1110,6 +1110,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/examples/Makefile.in b/examples/Makefile.in
-index 0b36437..5b609e5 100644
---- a/examples/Makefile.in
-+++ b/examples/Makefile.in
-@@ -1166,6 +1166,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/extratests/Makefile.in b/extratests/Makefile.in
-index ad331b3..3a4435b 100644
---- a/extratests/Makefile.in
-+++ b/extratests/Makefile.in
-@@ -1119,6 +1119,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/fish/Makefile.in b/fish/Makefile.in
-index 35190c9..aa5a8b2 100644
---- a/fish/Makefile.in
-+++ b/fish/Makefile.in
-@@ -1204,6 +1204,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/fuse/Makefile.in b/fuse/Makefile.in
-index 7398d3e..c02863b 100644
+index 3653843..c02863b 100644
--- a/fuse/Makefile.in
+++ b/fuse/Makefile.in
-@@ -1178,6 +1178,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1313,7 +1314,7 @@ CLEANFILES = stamp-guestmount.pod
+@@ -1314,7 +1314,7 @@ CLEANFILES = stamp-guestmount.pod
@HAVE_FUSE_TRUE at noinst_DATA = $(top_builddir)/html/guestmount.1.html
# Tests.
@@ -941,44 +601,8 @@ index 7398d3e..c02863b 100644
@HAVE_FUSE_TRUE at TESTS_ENVIRONMENT = \
@HAVE_FUSE_TRUE@ top_builddir=..
-diff --git a/generator/Makefile.in b/generator/Makefile.in
-index ca1c240..ec091af 100644
---- a/generator/Makefile.in
-+++ b/generator/Makefile.in
-@@ -1085,6 +1085,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
-index 549eabc..91824b5 100644
---- a/gnulib/lib/Makefile.in
-+++ b/gnulib/lib/Makefile.in
-@@ -1177,6 +1177,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in
-index 6ff9284..f2c12a9 100644
---- a/gnulib/tests/Makefile.in
-+++ b/gnulib/tests/Makefile.in
-@@ -2064,6 +2064,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/haskell/Makefile.in b/haskell/Makefile.in
-index b184ae6..2828869 100644
+index 5dc076e..2828869 100644
--- a/haskell/Makefile.in
+++ b/haskell/Makefile.in
@@ -68,6 +68,7 @@ build_triplet = @build@
@@ -989,15 +613,7 @@ index b184ae6..2828869 100644
subdir = haskell
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1103,6 +1104,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1210,7 +1212,7 @@ EXTRA_DIST = $(generator_built) *.hs run-bindtests
+@@ -1211,7 +1212,7 @@ EXTRA_DIST = $(generator_built) *.hs run-bindtests
@HAVE_HASKELL_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_HASKELL_TRUE@ $(VG)
@@ -1007,18 +623,10 @@ index b184ae6..2828869 100644
@HAVE_HASKELL_TRUE at GHCFLAGS = -I$(top_builddir)/src -L$(top_builddir)/src/.libs -i$(srcdir)
@HAVE_HASKELL_TRUE at all_targets = Bindtests Guestfs005Load Guestfs010Basic
diff --git a/images/Makefile.in b/images/Makefile.in
-index eb635d8..038a461 100644
+index 1c5168d..038a461 100644
--- a/images/Makefile.in
+++ b/images/Makefile.in
-@@ -1103,6 +1103,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1232,7 +1233,7 @@ noinst_DATA = test.iso
+@@ -1233,7 +1233,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.
@@ -1027,20 +635,8 @@ index eb635d8..038a461 100644
CLEANFILES = \
test.iso test.sqsh \
100kallzeroes 100kallnewlines 100kallspaces 100krandom 10klines \
-diff --git a/inspector/Makefile.in b/inspector/Makefile.in
-index 5d4521b..5854286 100644
---- a/inspector/Makefile.in
-+++ b/inspector/Makefile.in
-@@ -1180,6 +1180,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/java/Makefile.in b/java/Makefile.in
-index fdc84af..e8bc684 100644
+index 0437ee7..e8bc684 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -92,6 +92,7 @@ build_triplet = @build@
@@ -1051,15 +647,7 @@ index fdc84af..e8bc684 100644
subdir = java
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1190,6 +1191,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1263,7 +1265,7 @@ htmldir = @htmldir@
+@@ -1264,7 +1265,7 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
@@ -1068,7 +656,7 @@ index fdc84af..e8bc684 100644
libexecdir = @libexecdir@
lispdir = @lispdir@
localedir = @localedir@
-@@ -1352,7 +1354,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
+@@ -1353,7 +1354,7 @@ CLEANFILES = doc-stamp $(builddir)/com/redhat/et/libguestfs/*.class com_redhat_e
@HAVE_JAVA_TRUE at noinst_SCRIPTS = doc-stamp
# Tests (not comprehensive).
@@ -1077,20 +665,8 @@ index fdc84af..e8bc684 100644
@HAVE_JAVA_TRUE at TESTS_ENVIRONMENT = \
@HAVE_JAVA_TRUE@ JAVA=$(JAVA) \
@HAVE_JAVA_TRUE@ CLASSPATH=.:t:libguestfs-$(VERSION).jar \
-diff --git a/java/examples/Makefile.in b/java/examples/Makefile.in
-index f7e2b84..6af6780 100644
---- a/java/examples/Makefile.in
-+++ b/java/examples/Makefile.in
-@@ -1112,6 +1112,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
-index 6e4246d..6d86177 100644
+index b0aef84..6d86177 100644
--- a/ocaml/Makefile.in
+++ b/ocaml/Makefile.in
@@ -71,7 +71,11 @@ DIST_COMMON = $(srcdir)/.depend $(srcdir)/META.in \
@@ -1106,15 +682,7 @@ index 6e4246d..6d86177 100644
subdir = ocaml
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1108,6 +1112,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1217,7 +1222,7 @@ EXTRA_DIST = \
+@@ -1218,7 +1222,7 @@ EXTRA_DIST = \
t/*.ml
CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so t/*.cmi \
@@ -1123,7 +691,7 @@ index 6e4246d..6d86177 100644
AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
-I$(top_srcdir)/src -I$(top_builddir)/src \
$(WARN_CFLAGS) $(WERROR_CFLAGS)
-@@ -1237,14 +1242,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
+@@ -1238,14 +1242,9 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(OCAMLLIB) -I$(top_srcdir)/ocaml \
@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_OCAML_TRUE@ $(VG)
@@ -1141,20 +709,8 @@ index 6e4246d..6d86177 100644
@HAVE_OCAML_TRUE at SUFFIXES = .cmo .cmi .cmx .ml .mli .mll .mly
all: all-am
-diff --git a/ocaml/examples/Makefile.in b/ocaml/examples/Makefile.in
-index 63c9a21..c5e8aca 100644
---- a/ocaml/examples/Makefile.in
-+++ b/ocaml/examples/Makefile.in
-@@ -1112,6 +1112,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/perl/Makefile.in b/perl/Makefile.in
-index 1d78b62..6d477fa 100644
+index 95a8f68..6d477fa 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -68,6 +68,8 @@ build_triplet = @build@
@@ -1166,15 +722,7 @@ index 1d78b62..6d477fa 100644
subdir = perl
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1103,6 +1105,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1213,7 +1216,8 @@ EXTRA_DIST = \
+@@ -1214,7 +1216,8 @@ EXTRA_DIST = \
t/*.t \
typemap
@@ -1184,7 +732,7 @@ index 1d78b62..6d477fa 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 \
-@@ -1538,12 +1542,13 @@ appliance: force
+@@ -1539,12 +1542,13 @@ appliance: force
@HAVE_PERL_TRUE at test_images:
@HAVE_PERL_TRUE@ $(MAKE) -C $(top_builddir)/images
@@ -1199,68 +747,8 @@ index 1d78b62..6d477fa 100644
@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 552cbcd..35c1e86 100644
---- a/perl/examples/Makefile.in
-+++ b/perl/examples/Makefile.in
-@@ -1110,6 +1110,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/php/Makefile.in b/php/Makefile.in
-index 00a28c8..baaf50c 100644
---- a/php/Makefile.in
-+++ b/php/Makefile.in
-@@ -1127,6 +1127,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/po-docs/Makefile.in b/po-docs/Makefile.in
-index 14b33ff..b4035d7 100644
---- a/po-docs/Makefile.in
-+++ b/po-docs/Makefile.in
-@@ -1127,6 +1127,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/po-docs/ja/Makefile.in b/po-docs/ja/Makefile.in
-index 490ff30..fdd0fbc 100644
---- a/po-docs/ja/Makefile.in
-+++ b/po-docs/ja/Makefile.in
-@@ -1087,6 +1087,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/po-docs/uk/Makefile.in b/po-docs/uk/Makefile.in
-index 3d9e44c..b83d69f 100644
---- a/po-docs/uk/Makefile.in
-+++ b/po-docs/uk/Makefile.in
-@@ -1087,6 +1087,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/python/Makefile.in b/python/Makefile.in
-index 39b93dd..8aa691b 100644
+index 7db00ab..8aa691b 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -70,6 +70,7 @@ build_triplet = @build@
@@ -1271,15 +759,7 @@ index 39b93dd..8aa691b 100644
subdir = python
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1167,6 +1168,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1286,7 +1288,7 @@ EXTRA_DIST = \
+@@ -1287,7 +1288,7 @@ EXTRA_DIST = \
@HAVE_PYTHON_TRUE@ TMPDIR=$(top_builddir) \
@HAVE_PYTHON_TRUE@ PYTHON=$(PYTHON)
@@ -1288,44 +768,8 @@ index 39b93dd..8aa691b 100644
all: all-am
.SUFFIXES:
-diff --git a/python/examples/Makefile.in b/python/examples/Makefile.in
-index 1cb0176..9d9c562 100644
---- a/python/examples/Makefile.in
-+++ b/python/examples/Makefile.in
-@@ -1110,6 +1110,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/regressions/Makefile.in b/regressions/Makefile.in
-index 4a0d9a6..0d05bc8 100644
---- a/regressions/Makefile.in
-+++ b/regressions/Makefile.in
-@@ -1157,6 +1157,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/rescue/Makefile.in b/rescue/Makefile.in
-index 2eb35e7..28afde0 100644
---- a/rescue/Makefile.in
-+++ b/rescue/Makefile.in
-@@ -1168,6 +1168,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/resize/Makefile.in b/resize/Makefile.in
-index ba9f242..5a8a828 100644
+index 069f76e..5a8a828 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -72,6 +72,7 @@ DIST_COMMON = $(srcdir)/.depend $(srcdir)/Makefile.am \
@@ -1336,15 +780,7 @@ index ba9f242..5a8a828 100644
subdir = resize
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \
-@@ -1133,6 +1134,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1246,7 +1248,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+@@ -1247,7 +1248,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
# Note this list must be in dependency order.
@HAVE_OCAML_TRUE at OBJECTS = \
@@ -1353,7 +789,7 @@ index ba9f242..5a8a828 100644
@HAVE_OCAML_TRUE@ progress_c.o \
@HAVE_OCAML_TRUE@ utils.cmx \
@HAVE_OCAML_TRUE@ progress.cmx \
-@@ -1263,7 +1265,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+@@ -1264,7 +1265,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.
@@ -1362,7 +798,7 @@ index ba9f242..5a8a828 100644
# Manual pages and HTML files for the website.
@HAVE_OCAML_TRUE at man_MANS = virt-resize.1
-@@ -1278,7 +1280,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
+@@ -1279,7 +1280,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-resize test.img \
@HAVE_OCAML_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
@HAVE_OCAML_TRUE@ TMPDIR=$(top_builddir)
@@ -1372,40 +808,22 @@ index ba9f242..5a8a828 100644
.SUFFIXES:
diff --git a/ruby/Makefile.in b/ruby/Makefile.in
-index 54813ef..b479d8b 100644
+index 6f66259..b479d8b 100644
--- a/ruby/Makefile.in
+++ b/ruby/Makefile.in
-@@ -1103,6 +1103,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1225,10 +1226,11 @@ CLEANFILES = \
- @HAVE_RUBY_TRUE at TESTS_ENVIRONMENT = \
- @HAVE_RUBY_TRUE@ LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- @HAVE_RUBY_TRUE@ LIBGUESTFS_PATH=$(top_builddir)/appliance \
-- at HAVE_RUBY_TRUE@ TMPDIR=$(top_builddir)
-+ at HAVE_RUBY_TRUE@ TMPDIR=$(top_builddir) \
-+ at HAVE_RUBY_TRUE@ RUBY=$(RUBY)
-
-- at HAVE_RUBY_TRUE@RUBY_SITELIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-- at HAVE_RUBY_TRUE@RUBY_SITEARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+@@ -1229,8 +1229,8 @@ CLEANFILES = \
+ @HAVE_RUBY_TRUE@ TMPDIR=$(top_builddir) \
+ @HAVE_RUBY_TRUE@ RUBY=$(RUBY)
+
+- at HAVE_RUBY_TRUE@RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+- at HAVE_RUBY_TRUE@RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+ at HAVE_RUBY_TRUE@RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
+ at HAVE_RUBY_TRUE@RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
all: all-am
.SUFFIXES:
-@@ -1534,14 +1536,14 @@ appliance: force
- $(MAKE) -C $(top_builddir)/appliance
-
- @HAVE_RUBY_TRUE at all: $(generator_built)
-- at HAVE_RUBY_TRUE@ rake build
-- at HAVE_RUBY_TRUE@ rake rdoc
-+ at HAVE_RUBY_TRUE@ $(RAKE) build
-+ at HAVE_RUBY_TRUE@ $(RAKE) rdoc
+@@ -1540,10 +1540,10 @@ appliance: force
+ @HAVE_RUBY_TRUE@ $(RAKE) rdoc
@HAVE_RUBY_TRUE at install:
- at HAVE_RUBY_TRUE@ $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
@@ -1419,31 +837,11 @@ index 54813ef..b479d8b 100644
# 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 f1cec31..7820110 100644
---- a/ruby/examples/Makefile.in
-+++ b/ruby/examples/Makefile.in
-@@ -1110,6 +1110,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
-index 102154a..e7fda17 100644
+index 422291e..e7fda17 100644
--- a/sparsify/Makefile.in
+++ b/sparsify/Makefile.in
-@@ -1133,6 +1133,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1245,7 +1246,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+@@ -1246,7 +1246,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
# Note this list must be in dependency order.
@HAVE_OCAML_TRUE at OBJECTS = \
@@ -1452,7 +850,7 @@ index 102154a..e7fda17 100644
@HAVE_OCAML_TRUE@ progress_c.o \
@HAVE_OCAML_TRUE@ utils.cmx \
@HAVE_OCAML_TRUE@ progress.cmx \
-@@ -1256,13 +1257,13 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+@@ -1257,13 +1257,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.
@@ -1468,7 +866,7 @@ index 102154a..e7fda17 100644
# Manual pages and HTML files for the website.
@HAVE_OCAML_TRUE at man_MANS = virt-sparsify.1
-@@ -1276,7 +1277,7 @@ CLEANFILES = *~ *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify test.img \
+@@ -1277,7 +1277,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)
@@ -1477,43 +875,11 @@ index 102154a..e7fda17 100644
all: all-am
.SUFFIXES:
-diff --git a/src/Makefile.in b/src/Makefile.in
-index a8cf8ff..0751e3e 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -1200,6 +1200,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-diff --git a/test-tool/Makefile.in b/test-tool/Makefile.in
-index ab60fd1..727c6ef 100644
---- a/test-tool/Makefile.in
-+++ b/test-tool/Makefile.in
-@@ -1162,6 +1162,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
diff --git a/tools/Makefile.in b/tools/Makefile.in
-index b8a8818..6f5171a 100644
+index 47fd69f..6f5171a 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
-@@ -1132,6 +1132,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@
- REPLACE_WCWIDTH = @REPLACE_WCWIDTH@
- REPLACE_WRITE = @REPLACE_WRITE@
- RPCGEN = @RPCGEN@
-+RUBY = @RUBY@
- SED = @SED@
- SELINUX_LIB = @SELINUX_LIB@
- SERVENT_LIB = @SERVENT_LIB@
-@@ -1256,9 +1257,9 @@ CLEANFILES = test.img
+@@ -1257,9 +1257,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/0013-ruby-Add-RUBY-variable-for-specifying-the-correct-ve.patch b/debian/patches/0013-ruby-Add-RUBY-variable-for-specifying-the-correct-ve.patch
deleted file mode 100644
index cf6cf5b..0000000
--- a/debian/patches/0013-ruby-Add-RUBY-variable-for-specifying-the-correct-ve.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: Hilko Bengen <bengen at debian.org>
-Date: Tue, 6 Dec 2011 21:34:50 +0100
-Subject: ruby: Add RUBY variable for specifying the correct version
-
----
- configure.ac | 4 +++-
- ruby/Makefile.am | 11 ++++++-----
- ruby/Rakefile.in | 2 +-
- ruby/run-bindtests | 2 +-
- ruby/run-ruby-tests | 4 ++--
- 5 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d4ffbc6..e7f5f91 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -770,8 +770,10 @@ AC_ARG_ENABLE([ruby],
- [enable_ruby=yes])
- AS_IF([test "x$enable_ruby" != "xno"],
- [
-- AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
-+ AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
- AC_CHECK_PROG([RAKE],[rake],[rake],[no])
-+ AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
-+ AC_SUBST([RAKE])
- ])
- AM_CONDITIONAL([HAVE_RUBY],
- [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-diff --git a/ruby/Makefile.am b/ruby/Makefile.am
-index c68cd4a..97b2383 100644
---- a/ruby/Makefile.am
-+++ b/ruby/Makefile.am
-@@ -49,14 +49,15 @@ TESTS = run-bindtests run-ruby-tests
- TESTS_ENVIRONMENT = \
- LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
- LIBGUESTFS_PATH=$(top_builddir)/appliance \
-- TMPDIR=$(top_builddir)
-+ TMPDIR=$(top_builddir) \
-+ RUBY=$(RUBY)
-
- all: $(generator_built)
-- rake build
-- rake rdoc
-+ $(RAKE) build
-+ $(RAKE) rdoc
-
--RUBY_VENDORLIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
--RUBY_VENDORARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
-+RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
-+RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
-
- install:
- $(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
-diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in
-index f4bf901..9ae993b 100644
---- a/ruby/Rakefile.in
-+++ b/ruby/Rakefile.in
-@@ -38,7 +38,7 @@ CLOBBER.include [ "@builddir@/config.save", "@builddir@/ext/**/mkmf.log",
- # Build locally
-
- file MAKEFILE => EXT_CONF do |t|
-- unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/ext/guestfs; ruby #{EXT_CONF} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs"
-+ unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; mkdir -p @builddir@/ext/guestfs; cd @builddir@/ext/guestfs; @RUBY@ #{EXT_CONF} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs"
- $stderr.puts "Failed to run extconf"
- break
- end
-diff --git a/ruby/run-bindtests b/ruby/run-bindtests
-index 4cac863..aafcfba 100755
---- a/ruby/run-bindtests
-+++ b/ruby/run-bindtests
-@@ -18,5 +18,5 @@
-
- set -e
-
--ruby -I${srcdir}/lib -Iext/guestfs ${srcdir}/bindtests.rb > bindtests.tmp
-+$RUBY -I${srcdir}/lib -Iext/guestfs ${srcdir}/bindtests.rb > bindtests.tmp
- diff -u ${srcdir}/../bindtests bindtests.tmp
-diff --git a/ruby/run-ruby-tests b/ruby/run-ruby-tests
-index e21899a..c618241 100755
---- a/ruby/run-ruby-tests
-+++ b/ruby/run-ruby-tests
-@@ -22,6 +22,6 @@ set -e
- # is bound to fail because they all use a single test image file).
-
- for f in tests/tc_*.rb; do
-- echo rake test "$@" TEST="$f"
-- rake test "$@" TEST="$f"
-+ echo $RAKE test "$@" TEST="$f"
-+ $RAKE test "$@" TEST="$f"
- done
---
diff --git a/debian/patches/series b/debian/patches/series
index 62d9bbe..90217d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,5 +10,4 @@
0010-Fix-include.patch
0011-Install-Java-bindings-to-jni-subdirectory.patch
0012-ruby-install-to-vendor_ruby.patch
-0013-ruby-Add-RUBY-variable-for-specifying-the-correct-ve.patch
-0014-autoreconf.patch
+0013-autoreconf.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git
More information about the Pkg-libvirt-commits
mailing list