[Pkg-libvirt-commits] [libguestfs] 33/37: Imported Upstream version 1.15.10
Hilko Bengen
bengen at moszumanska.debian.org
Sun Dec 22 18:13:49 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.10-1
in repository libguestfs.
commit a849af1b73f41c25fcc68db2544b953474d2a789
Author: Hilko Bengen <bengen at debian.org>
Date: Tue Dec 6 21:14:32 2011 +0100
Imported Upstream version 1.15.10
---
BUGS | 73 ++-----
ChangeLog | 51 +++++
Makefile.in | 3 +-
TODO | 1 -
align/Makefile.in | 3 +-
appliance/Makefile.in | 3 +-
appliance/packagelist.in | 1 +
capitests/Makefile.in | 3 +-
cat/Makefile.in | 3 +-
caution/Makefile.in | 3 +-
clone/Makefile.in | 3 +-
configure | 396 ++++++++++++++++++++-----------------
configure.ac | 31 ++-
csharp/Makefile.in | 3 +-
daemon/Makefile.am | 4 +-
daemon/Makefile.in | 7 +-
daemon/blkid.c | 80 +++++++-
debian/changelog | 4 +-
df/Makefile.in | 3 +-
edit/Makefile.in | 3 +-
erlang/Makefile.in | 3 +-
erlang/examples/Makefile.in | 3 +-
examples/Makefile.in | 3 +-
extratests/Makefile.in | 3 +-
fish/Makefile.am | 2 +-
fish/Makefile.in | 5 +-
fuse/Makefile.in | 3 +-
generator/Makefile.in | 3 +-
generator/generator_ruby.ml | 13 +-
gnulib/lib/Makefile.in | 3 +-
gnulib/tests/Makefile.in | 3 +-
haskell/Makefile.in | 3 +-
images/Makefile.in | 3 +-
inspector/Makefile.in | 3 +-
java/Makefile.in | 3 +-
java/examples/Makefile.in | 3 +-
libguestfs.pc | 2 +-
ocaml/Makefile.in | 3 +-
ocaml/examples/Makefile.in | 3 +-
perl/Makefile.in | 3 +-
perl/examples/Makefile.in | 3 +-
php/Makefile.in | 3 +-
po-docs/Makefile.in | 3 +-
po-docs/ja/Makefile.in | 3 +-
po-docs/ja/guestfish.1 | 2 +-
po-docs/ja/guestfs.3 | 2 +-
po-docs/ja/guestmount.1 | 2 +-
po-docs/ja/libguestfs-test-tool.1 | 2 +-
po-docs/ja/virt-alignment-scan.1 | 2 +-
po-docs/ja/virt-cat.1 | 2 +-
po-docs/ja/virt-copy-in.1 | 2 +-
po-docs/ja/virt-copy-out.1 | 2 +-
po-docs/ja/virt-df.1 | 2 +-
po-docs/ja/virt-edit.1 | 2 +-
po-docs/ja/virt-filesystems.1 | 2 +-
po-docs/ja/virt-inspector.1 | 2 +-
po-docs/ja/virt-list-filesystems.1 | 2 +-
po-docs/ja/virt-list-partitions.1 | 2 +-
po-docs/ja/virt-ls.1 | 2 +-
po-docs/ja/virt-make-fs.1 | 2 +-
po-docs/ja/virt-rescue.1 | 2 +-
po-docs/ja/virt-resize.1 | 2 +-
po-docs/ja/virt-sparsify.1 | 2 +-
po-docs/ja/virt-sysprep.1 | 2 +-
po-docs/ja/virt-tar-in.1 | 2 +-
po-docs/ja/virt-tar-out.1 | 2 +-
po-docs/ja/virt-tar.1 | 2 +-
po-docs/ja/virt-win-reg.1 | 2 +-
po-docs/libguestfs-docs.pot | 4 +-
po-docs/uk/Makefile.in | 3 +-
po-docs/uk/guestfish.1 | 2 +-
po-docs/uk/guestfs.3 | 2 +-
po-docs/uk/guestmount.1 | 2 +-
po-docs/uk/libguestfs-test-tool.1 | 2 +-
po-docs/uk/virt-alignment-scan.1 | 2 +-
po-docs/uk/virt-cat.1 | 2 +-
po-docs/uk/virt-copy-in.1 | 2 +-
po-docs/uk/virt-copy-out.1 | 2 +-
po-docs/uk/virt-df.1 | 2 +-
po-docs/uk/virt-edit.1 | 2 +-
po-docs/uk/virt-filesystems.1 | 2 +-
po-docs/uk/virt-inspector.1 | 2 +-
po-docs/uk/virt-list-filesystems.1 | 2 +-
po-docs/uk/virt-list-partitions.1 | 2 +-
po-docs/uk/virt-ls.1 | 2 +-
po-docs/uk/virt-make-fs.1 | 2 +-
po-docs/uk/virt-rescue.1 | 2 +-
po-docs/uk/virt-resize.1 | 2 +-
po-docs/uk/virt-sparsify.1 | 2 +-
po-docs/uk/virt-sysprep.1 | 2 +-
po-docs/uk/virt-tar-in.1 | 2 +-
po-docs/uk/virt-tar-out.1 | 2 +-
po-docs/uk/virt-tar.1 | 2 +-
po-docs/uk/virt-win-reg.1 | 2 +-
po/en_GB.gmo | Bin 10781 -> 10781 bytes
po/en_GB.po | 2 +-
po/es.gmo | Bin 92709 -> 92709 bytes
po/es.po | 2 +-
po/gu.gmo | Bin 53605 -> 53605 bytes
po/gu.po | 2 +-
po/hi.gmo | Bin 43389 -> 43389 bytes
po/hi.po | 2 +-
po/kn.gmo | Bin 52822 -> 52822 bytes
po/kn.po | 2 +-
po/libguestfs.pot | 4 +-
po/ml.gmo | Bin 56355 -> 56355 bytes
po/ml.po | 2 +-
po/mr.gmo | Bin 104937 -> 104937 bytes
po/mr.po | 2 +-
po/nl.gmo | Bin 90946 -> 90946 bytes
po/nl.po | 2 +-
po/or.gmo | Bin 52173 -> 52173 bytes
po/or.po | 2 +-
po/pa.gmo | Bin 90834 -> 90834 bytes
po/pa.po | 2 +-
po/pl.gmo | Bin 95389 -> 95389 bytes
po/pl.po | 2 +-
po/ta.gmo | Bin 47311 -> 47311 bytes
po/ta.po | 2 +-
po/te.gmo | Bin 49970 -> 49970 bytes
po/te.po | 2 +-
po/uk.gmo | Bin 125123 -> 125123 bytes
po/uk.po | 2 +-
python/Makefile.in | 3 +-
python/examples/Makefile.in | 3 +-
regressions/Makefile.in | 3 +-
rescue/Makefile.in | 3 +-
resize/Makefile.in | 3 +-
ruby/Makefile.in | 3 +-
ruby/examples/Makefile.in | 3 +-
ruby/ext/guestfs/_guestfs.c | 29 ++-
sparsify/Makefile.in | 3 +-
src/Makefile.am | 2 +-
src/Makefile.in | 10 +-
test-tool/Makefile.in | 3 +-
tools/Makefile.in | 3 +-
136 files changed, 567 insertions(+), 399 deletions(-)
diff --git a/BUGS b/BUGS
index 35dc5b1..36e7fba 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2011-12-03
+Last updated: 2011-12-06
This contains a local list of the bugs that are open against
libguestfs. Bugs are tracked in the Red Hat Bugzilla database
@@ -62,6 +62,18 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
755729 NEW https://bugzilla.redhat.com/show_bug.cgi?id=755729
Error message for resize2fs-M needs tweaking
+760221 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760221
+ RFE: Support inspection of cciss devices
+
+760223 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760223
+ RFE: Support inspection of MD devices
+
+760244 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760244
+ RFE: Support inspection of cciss devices
+
+760245 NEW https://bugzilla.redhat.com/show_bug.cgi?id=760245
+ RFE: Support inspection of MD devices
+
563450 NEW https://bugzilla.redhat.com/show_bug.cgi?id=563450
list-devices returns devices of different types out of order
@@ -75,7 +87,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
[RFE] virt-edit/tar/inspector do not support encrypted system
679737 NEW https://bugzilla.redhat.com/show_bug.cgi?id=679737
- zerofree is unavailable
+ libguestfs: improve error message when zerofree is not available in the appliance
745282 NEW https://bugzilla.redhat.com/show_bug.cgi?id=745282
[RFE] Support to use virt-filesystems with remote libvirt systems
@@ -119,9 +131,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
627675 NEW https://bugzilla.redhat.com/show_bug.cgi?id=627675
libguestfs inspector code cannot handle /dev/disk/by-id/* paths
-634649 NEW https://bugzilla.redhat.com/show_bug.cgi?id=634649
- [RFE] Write a tool to align the partition(s) in a Windows XP image to a multiple of 8 sectors
-
635971 NEW https://bugzilla.redhat.com/show_bug.cgi?id=635971
glob mkfs ext2 /dev/vd[b-t]1 does not expand
@@ -177,58 +186,10 @@ You can help by testing the fixes.
750889 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=750889
Python code incompatible with Python v3.
+760000 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=760000
+ libguestfs fails to compile with Ruby >= 1.9
+
657499 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=657499
checksum: wrong check sum type causes umount to fail
---------------------------------------------------
-These bugs are in the VERIFIED state.
-
-672491 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=672491
- RFE: guestfs_last_errno should be exposed in perl bindings
-
-684980 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=684980
- calling guestfs_kill_subprocess() then guestfs_close() causes a lockup in some applications
-
-695881 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=695881
- virt-make-fs generates qemu-img command line containing decimal point: "qemu-img: Invalid image size specified!"
-
-727178 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=727178
- error: luks_open: cryptsetup: error while loading shared libraries: libfipscheck.so.1: cannot open shared object file: No such file or directory
-
-627835 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=627835
- libguestfs protocol loses synchronization if you 'upload' before mounting disks
-
-729887 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=729887
- appliance crashes running aug_init with flags=4
-
-678231 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=678231
- virt-inspector reports unknown filesystem UUID
-
-685009 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=685009
- Got error when expanding ntfs filesystem
-
-690358 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=690358
- Better to point out in manual page that fullvirt query doesn't support Windows guest
-
-692394 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=692394
- inspect-list-applications fails to detect 32 bit apps installed under WOW64 emulator on 64 bit Windows
-
-693306 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=693306
- sfdisk's python interface only accepts lists of type 'list' for the lines parameter
-
-603000 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=603000
- part-get-bootable gives wrong result with an unordered part layout
-
-666578 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=666578
- libguestfs: unknown filesystem label SWAP-sda2
-
-682980 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=682980
- libguestfs incorrectly detects Red Hat desktop as 'redhat-based' instead of 'redhat'
-
-688062 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=688062
- fish: add luks-open mapped device to tab completion list
-
-730248 VERIFIED https://bugzilla.redhat.com/show_bug.cgi?id=730248
- 'guestfish --remote run' hangs in a shell command substitution context
-
End of BUGS file.
diff --git a/ChangeLog b/ChangeLog
index 63a5278..f15b4e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+2011-12-06 Hilko Bengen <bengen at hilluzination.de>
+
+ Fix rpcgen post-processing for out-of-tree builds
+
+2011-12-05 Richard W.M. Jones <rjones at redhat.com>
+
+ ruby: Use RSTRING_PTR, RSTRING_LEN for compat with Ruby 1.9 (RHBZ#760000).
+
+2011-12-05 Wanlong Gao <gaowanlong at cn.fujitsu.com>
+
+ blkid: split the RHEL5 which can't support some options
+ RHEL5 shoult not support '-p', '-i' and '-o export' options.
+ But we just split it according to the '-p' option.
+
+ TODO: remove the implemented command blkid
+ Remove the implemented command blkid from TODO lists.
+
+2011-12-04 Richard W.M. Jones <rjones at redhat.com>
+
+ Revert "blkid: Use -c /dev/null because RHEL 5 blkid doesn't have -p option."
+ This reverts commit 6533491b178d18bfab8240cf093be4ef9b547548.
+
+ Revert "blkid: Fix mistake in previous commit."
+ This reverts commit c48226a5026816b115ab63b50d3601531aff59dc.
+
+2011-12-03 Richard W.M. Jones <rjones at redhat.com>
+
+ blkid: Fix mistake in previous commit.
+ This updates commit 6533491b178d18bfab8240cf093be4ef9b547548.
+
+ blkid: Use -c /dev/null because RHEL 5 blkid doesn't have -p option.
+
+ daemon: Use pkg-config to locate Augeas CFLAGS / libraries.
+ Augeas 0.10 depends on libxml2, so this is now required in the
+ appliance (in fact, it was already present).
+
+ However this exposed two bugs:
+
+ (1) In libguestfs we use a home-brewed recipe for Augeas flags,
+ resulting in this error:
+ /usr/include/augeas.h:24:25: fatal error: libxml/tree.h: No such file or directory
+
+ (2) Augeas's own augeas.pc didn't include the libxml2 flags, so
+ it was broken. This requires a patch to Augeas 0.10, see:
+ https://www.redhat.com/archives/augeas-devel/2011-December/msg00008.html
+
+ Change to using pkg-config to detect Augeas. It is still an optional
+ library.
+
+ Version 1.15.9.
+
2011-12-03 Wanlong Gao <wanlong.gao at gmail.com>
NEW API: add blkid command to print the attributes of the device
diff --git a/Makefile.in b/Makefile.in
index 9e4e9b4..c07b72f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -323,7 +323,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/TODO b/TODO
index 15660cc..3adb740 100644
--- a/TODO
+++ b/TODO
@@ -94,7 +94,6 @@ Ideas for extra commands
chattr
lsattr
badblocks
- blkid
debugfs
dumpe2fs
e2image
diff --git a/align/Makefile.in b/align/Makefile.in
index 4026cb6..0a48a3b 100644
--- a/align/Makefile.in
+++ b/align/Makefile.in
@@ -278,7 +278,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/appliance/Makefile.in b/appliance/Makefile.in
index 15bf21d..01c2024 100644
--- a/appliance/Makefile.in
+++ b/appliance/Makefile.in
@@ -231,7 +231,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/appliance/packagelist.in b/appliance/packagelist.in
index 9b723d0..550ba8b 100644
--- a/appliance/packagelist.in
+++ b/appliance/packagelist.in
@@ -105,6 +105,7 @@ gawk
grep
gzip
jfsutils
+libxml2
lsof
lvm2
lzop
diff --git a/capitests/Makefile.in b/capitests/Makefile.in
index 6741ab1..41eabd3 100644
--- a/capitests/Makefile.in
+++ b/capitests/Makefile.in
@@ -327,7 +327,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/cat/Makefile.in b/cat/Makefile.in
index 430142e..2c3e3c6 100644
--- a/cat/Makefile.in
+++ b/cat/Makefile.in
@@ -302,7 +302,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/caution/Makefile.in b/caution/Makefile.in
index 909b75e..f3942ad 100644
--- a/caution/Makefile.in
+++ b/caution/Makefile.in
@@ -214,7 +214,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/clone/Makefile.in b/clone/Makefile.in
index 8e8974d..a20d120 100644
--- a/clone/Makefile.in
+++ b/clone/Makefile.in
@@ -238,7 +238,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/configure b/configure
index 9f2f41f..b51d13b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for libguestfs 1.15.9.
+# Generated by GNU Autoconf 2.68 for libguestfs 1.15.10.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -567,8 +567,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libguestfs'
PACKAGE_TARNAME='libguestfs'
-PACKAGE_VERSION='1.15.9'
-PACKAGE_STRING='libguestfs 1.15.9'
+PACKAGE_VERSION='1.15.10'
+PACKAGE_STRING='libguestfs 1.15.10'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -707,9 +707,6 @@ LIBVIRT_CFLAGS
MAGIC_LIBS
PCRE_LIBS
PCRE_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
POSUB
INTLLIBS
LTLIBICONV
@@ -743,7 +740,11 @@ POD2MAN
GPERF
CPIO
SELINUX_LIB
-AUGEAS_LIB
+AUGEAS_LIBS
+AUGEAS_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
HAVE_RPCGEN_FALSE
HAVE_RPCGEN_TRUE
RPCGEN
@@ -1732,6 +1733,8 @@ CPP
PKG_CONFIG
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
+AUGEAS_CFLAGS
+AUGEAS_LIBS
PCRE_CFLAGS
PCRE_LIBS
LIBVIRT_CFLAGS
@@ -2289,7 +2292,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libguestfs 1.15.9 to adapt to many kinds of systems.
+\`configure' configures libguestfs 1.15.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2359,7 +2362,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libguestfs 1.15.9:";;
+ short | recursive ) echo "Configuration of libguestfs 1.15.10:";;
esac
cat <<\_ACEOF
@@ -2440,6 +2443,9 @@ Some influential environment variables:
directories to add to pkg-config's search path
PKG_CONFIG_LIBDIR
path overriding pkg-config's built-in search path
+ AUGEAS_CFLAGS
+ C compiler flags for AUGEAS, overriding pkg-config
+ AUGEAS_LIBS linker flags for AUGEAS, overriding pkg-config
PCRE_CFLAGS C compiler flags for PCRE, overriding pkg-config
PCRE_LIBS linker flags for PCRE, overriding pkg-config
LIBVIRT_CFLAGS
@@ -2529,7 +2535,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libguestfs configure 1.15.9
+libguestfs configure 1.15.10
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3271,7 +3277,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libguestfs $as_me 1.15.9, which was
+It was created by libguestfs $as_me 1.15.10, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -4169,7 +4175,7 @@ fi
# Define the identity of the package.
PACKAGE='libguestfs'
- VERSION='1.15.9'
+ VERSION='1.15.10'
cat >>confdefs.h <<_ACEOF
@@ -4266,8 +4272,8 @@ else
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: libguestfs version 1.15.9$libguestfs_extra" >&5
-$as_echo "$as_me: libguestfs version 1.15.9$libguestfs_extra" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: libguestfs version 1.15.10$libguestfs_extra" >&5
+$as_echo "$as_me: libguestfs version 1.15.10$libguestfs_extra" >&6;}
$as_echo "#define PACKAGE_VERSION_MAJOR 1" >>confdefs.h
@@ -4276,7 +4282,7 @@ $as_echo "#define PACKAGE_VERSION_MAJOR 1" >>confdefs.h
$as_echo "#define PACKAGE_VERSION_MINOR 15" >>confdefs.h
-$as_echo "#define PACKAGE_VERSION_RELEASE 9" >>confdefs.h
+$as_echo "#define PACKAGE_VERSION_RELEASE 10" >>confdefs.h
cat >>confdefs.h <<_ACEOF
@@ -45399,74 +45405,217 @@ fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aug_match in -laugeas" >&5
-$as_echo_n "checking for aug_match in -laugeas... " >&6; }
-if ${ac_cv_lib_augeas_aug_match+:} false; then :
+
+
+
+
+
+
+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.
+set dummy ${ac_tool_prefix}pkg-config; 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_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-laugeas $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
-/* 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 aug_match ();
-int
-main ()
-{
-return aug_match ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_augeas_aug_match=yes
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
- ac_cv_lib_augeas_aug_match=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
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_augeas_aug_match" >&5
-$as_echo "$ac_cv_lib_augeas_aug_match" >&6; }
-if test "x$ac_cv_lib_augeas_aug_match" = xyes; then :
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; 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_path_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ 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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
- have_augeas=yes
- AUGEAS_LIB="-laugeas"
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- old_LIBS="$LIBS"
- LIBS="$LIBS $AUGEAS_LIB"
- for ac_func in aug_load aug_defvar aug_defnode
-do :
- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
fi
-done
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
+ fi
+fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUGEAS" >&5
+$as_echo_n "checking for AUGEAS... " >&6; }
+
+if test -n "$AUGEAS_CFLAGS"; then
+ pkg_cv_AUGEAS_CFLAGS="$AUGEAS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"augeas\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "augeas") 2>&5
+ ac_status=$?
+ $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`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$AUGEAS_LIBS"; then
+ pkg_cv_AUGEAS_LIBS="$AUGEAS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"augeas\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "augeas") 2>&5
+ ac_status=$?
+ $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`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
- LIBS="$old_LIBS"
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
else
- have_augeas=no
+ _pkg_short_errors_supported=no
fi
+ if test $_pkg_short_errors_supported = yes; then
+ AUGEAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "augeas" 2>&1`
+ else
+ AUGEAS_PKG_ERRORS=`$PKG_CONFIG --print-errors "augeas" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$AUGEAS_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: augeas not found, some core features will be disabled" >&5
+$as_echo "$as_me: WARNING: augeas not found, some core features will be disabled" >&2;}
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: augeas not found, some core features will be disabled" >&5
+$as_echo "$as_me: WARNING: augeas not found, some core features will be disabled" >&2;}
+else
+ AUGEAS_CFLAGS=$pkg_cv_AUGEAS_CFLAGS
+ AUGEAS_LIBS=$pkg_cv_AUGEAS_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
-if test "x$have_augeas" = "xyes"; then
$as_echo "#define HAVE_AUGEAS 1" >>confdefs.h
+
+ old_LIBS="$LIBS"
+ LIBS="$LIBS $AUGEAS_LIBS"
+ for ac_func in aug_load aug_defvar aug_defnode
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
fi
+done
+
+ LIBS="$old_LIBS"
+fi
for ac_header in selinux/selinux.h
do :
@@ -48085,125 +48234,6 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
-
-
-
-
-
-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.
-set dummy ${ac_tool_prefix}pkg-config; 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_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- 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_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; 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_path_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- 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_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-fi
-
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE" >&5
$as_echo_n "checking for PCRE... " >&6; }
@@ -51845,7 +51875,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libguestfs $as_me 1.15.9, which was
+This file was extended by libguestfs $as_me 1.15.10, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -51915,7 +51945,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libguestfs config.status 1.15.9
+libguestfs config.status 1.15.10
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 6e67eb0..ea0aec4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
# freeform string.
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [15])
-m4_define([libguestfs_release], [9])
+m4_define([libguestfs_release], [10])
AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
AC_CONFIG_AUX_DIR([build-aux])
@@ -315,22 +315,19 @@ AC_CHECK_LIB([portablexdr],[xdrmem_create],[],[
AC_SEARCH_LIBS([xdrmem_create],[rpc xdr nsl])
])
-dnl Check for Augeas (now optional).
-AC_CHECK_LIB([augeas],[aug_match],[
- have_augeas=yes
- AUGEAS_LIB="-laugeas"
-
- old_LIBS="$LIBS"
- LIBS="$LIBS $AUGEAS_LIB"
- dnl Check for functions not available in earlier versions of Augeas.
- AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode])
- LIBS="$old_LIBS"
-
- ],[have_augeas=no])
-if test "x$have_augeas" = "xyes"; then
- AC_DEFINE([HAVE_AUGEAS],[1],[Define to 1 if you have Augeas])
-fi
-AC_SUBST([AUGEAS_LIB])
+dnl Check for Augeas (optional).
+PKG_CHECK_MODULES([AUGEAS], [augeas],
+ [AC_SUBST([AUGEAS_CFLAGS])
+ AC_SUBST([AUGEAS_LIBS])
+ AC_DEFINE([HAVE_AUGEAS],[1],[Define to 1 if you have Augeas])
+
+ old_LIBS="$LIBS"
+ LIBS="$LIBS $AUGEAS_LIBS"
+ dnl Check for functions not available in earlier versions of Augeas.
+ AC_CHECK_FUNCS([aug_load aug_defvar aug_defnode])
+ LIBS="$old_LIBS"
+ ],
+ [AC_MSG_WARN([augeas not found, some core features will be disabled])])
dnl Check for libselinux (optional).
AC_CHECK_HEADERS([selinux/selinux.h])
diff --git a/csharp/Makefile.in b/csharp/Makefile.in
index b81ddc7..0563335 100644
--- a/csharp/Makefile.in
+++ b/csharp/Makefile.in
@@ -207,7 +207,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 71d6a63..a19a157 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -166,7 +166,7 @@ guestfsd_LDADD = \
liberrnostring.a \
libprotocol.a \
$(SELINUX_LIB) \
- $(AUGEAS_LIB) \
+ $(AUGEAS_LIBS) \
$(top_builddir)/gnulib/lib/.libs/libgnu.a \
$(GETADDRINFO_LIB) \
$(HOSTENT_LIB) \
@@ -177,6 +177,6 @@ guestfsd_LDADD = \
$(SERVENT_LIB)
guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
-guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS)
.PHONY: force
diff --git a/daemon/Makefile.in b/daemon/Makefile.in
index 2d65cbd..3b4126a 100644
--- a/daemon/Makefile.in
+++ b/daemon/Makefile.in
@@ -305,7 +305,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -1407,7 +1408,7 @@ guestfsd_LDADD = \
liberrnostring.a \
libprotocol.a \
$(SELINUX_LIB) \
- $(AUGEAS_LIB) \
+ $(AUGEAS_LIBS) \
$(top_builddir)/gnulib/lib/.libs/libgnu.a \
$(GETADDRINFO_LIB) \
$(HOSTENT_LIB) \
@@ -1418,7 +1419,7 @@ guestfsd_LDADD = \
$(SERVENT_LIB)
guestfsd_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib
-guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+guestfsd_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(AUGEAS_CFLAGS)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/daemon/blkid.c b/daemon/blkid.c
index a7fd6bc..f23eac6 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -84,18 +84,42 @@ do_vfs_uuid (const char *device)
return get_blkid_tag (device, "UUID");
}
-char **
-do_blkid(const char *device)
+/* RHEL5 blkid doesn't have the -p(partition info) option and the
+ * -i(I/O limits) option so we must test for these options the first
+ * time the function is called.
+ */
+static int
+test_blkid_p_opt(void)
+{
+ static int result;
+ char *err = NULL;
+
+ int r = commandr(NULL, &err, "blkid", "-p", "/dev/null", NULL);
+ if (r == -1) {
+ reply_with_error("could not run 'blkid' command: %s", err);
+ free(err);
+ return -1;
+ }
+
+ if (strstr(err, "invalid option --"))
+ result = 0;
+ else
+ result = 1;
+ free(err);
+ return result;
+}
+
+static char **
+blkid_with_p_opt(const char *device)
{
int r;
char *out = NULL, *err = NULL;
char **lines = NULL;
-
char **ret = NULL;
int size = 0, alloc = 0;
- const char *blkid[] = {"blkid", "-p", "-i", "-o", "export", device, NULL};
- r = commandv(&out, &err, blkid);
+ r = command(&out, &err, "blkid", "-c", "/dev/null",
+ "-p", "-i", "-o", "export", device, NULL);
if (r == -1) {
reply_with_error("%s", err);
goto error;
@@ -142,12 +166,12 @@ do_blkid(const char *device)
}
}
+ if (add_string(&ret, &size, &alloc, NULL) == -1) goto error;
+
free(out);
free(err);
free(lines);
- if (add_string(&ret, &size, &alloc, NULL) == -1) return NULL;
-
return ret;
error:
@@ -158,3 +182,45 @@ error:
return NULL;
}
+
+static char **
+blkid_without_p_opt(const char *device)
+{
+ char **ret = NULL;
+ int size = 0, alloc = 0;
+
+ if (add_string(&ret, &size, &alloc, "TYPE") == -1) goto error;
+ if (add_string(&ret, &size, &alloc, get_blkid_tag(device, "TYPE")) == -1)
+ goto error;
+ if (add_string(&ret, &size, &alloc, "LABEL") == -1) goto error;
+ if (add_string(&ret, &size, &alloc, get_blkid_tag(device, "LABEL")) == -1)
+ goto error;
+ if (add_string(&ret, &size, &alloc, "UUID") == -1) goto error;
+ if (add_string(&ret, &size, &alloc, get_blkid_tag(device, "UUID")) == -1)
+ goto error;
+ if (add_string_nodup(&ret, &size, &alloc, NULL) == -1) goto error;
+
+ return ret;
+error:
+ if (ret) free_strings(ret);
+ return NULL;
+}
+
+char **
+do_blkid(const char *device)
+{
+ int r;
+ char *out = NULL, *err = NULL;
+ char **lines = NULL;
+
+ char **ret = NULL;
+ int size = 0, alloc = 0;
+ int blkid_has_p_opt;
+
+ if ((blkid_has_p_opt = test_blkid_p_opt()) == -1)
+ return NULL;
+ else if (blkid_has_p_opt)
+ return blkid_with_p_opt(device);
+ else
+ return blkid_without_p_opt(device);
+}
diff --git a/debian/changelog b/debian/changelog
index f282eff..2b36b5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-libguestfs (1.15.9-1) unstable; urgency=low
+libguestfs (1.15.10-1) unstable; urgency=low
- * release: New upstream version 1.15.9.
+ * release: New upstream version 1.15.10.
-- Richard W.M. Jones <rjones at redhat.com> Thu, 9 Dec 2010 12:00:00 +0000
diff --git a/df/Makefile.in b/df/Makefile.in
index ad4c23d..66514a7 100644
--- a/df/Makefile.in
+++ b/df/Makefile.in
@@ -278,7 +278,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/edit/Makefile.in b/edit/Makefile.in
index 8975b9c..9fe322c 100644
--- a/edit/Makefile.in
+++ b/edit/Makefile.in
@@ -275,7 +275,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/erlang/Makefile.in b/erlang/Makefile.in
index 625c277..940c4f8 100644
--- a/erlang/Makefile.in
+++ b/erlang/Makefile.in
@@ -271,7 +271,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/erlang/examples/Makefile.in b/erlang/examples/Makefile.in
index e2542fd..58f79fd 100644
--- a/erlang/examples/Makefile.in
+++ b/erlang/examples/Makefile.in
@@ -216,7 +216,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 94be9d0..0b36437 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -272,7 +272,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/extratests/Makefile.in b/extratests/Makefile.in
index 79d614d..ad331b3 100644
--- a/extratests/Makefile.in
+++ b/extratests/Makefile.in
@@ -225,7 +225,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/fish/Makefile.am b/fish/Makefile.am
index 6ca8a82..16a29b0 100644
--- a/fish/Makefile.am
+++ b/fish/Makefile.am
@@ -139,7 +139,7 @@ if HAVE_RPCGEN
rc_protocol.c: rc_protocol.x
rm -f $@-t $@-t2
$(RPCGEN) -c -o $@-t $<
- sed 's,\.\./\.\./fish/,,' < $@-t > $@-t2
+ sed 's,\.\./\(\.\./\)*fish,.,' < $@-t > $@-t2
rm $@-t
mv $@-t2 $@
diff --git a/fish/Makefile.in b/fish/Makefile.in
index 5270869..35190c9 100644
--- a/fish/Makefile.in
+++ b/fish/Makefile.in
@@ -310,7 +310,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2529,7 +2530,7 @@ cmds_gperf.c: cmds_gperf.gperf
@HAVE_RPCGEN_TRUE at rc_protocol.c: rc_protocol.x
@HAVE_RPCGEN_TRUE@ rm -f $@-t $@-t2
@HAVE_RPCGEN_TRUE@ $(RPCGEN) -c -o $@-t $<
- at HAVE_RPCGEN_TRUE@ sed 's,\.\./\.\./fish/,,' < $@-t > $@-t2
+ at HAVE_RPCGEN_TRUE@ sed 's,\.\./\(\.\./\)*fish,.,' < $@-t > $@-t2
@HAVE_RPCGEN_TRUE@ rm $@-t
@HAVE_RPCGEN_TRUE@ mv $@-t2 $@
diff --git a/fuse/Makefile.in b/fuse/Makefile.in
index b2b7a49..7398d3e 100644
--- a/fuse/Makefile.in
+++ b/fuse/Makefile.in
@@ -284,7 +284,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/generator/Makefile.in b/generator/Makefile.in
index 6ed4857..ca1c240 100644
--- a/generator/Makefile.in
+++ b/generator/Makefile.in
@@ -191,7 +191,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/generator/generator_ruby.ml b/generator/generator_ruby.ml
index a43b21f..82d0018 100644
--- a/generator/generator_ruby.ml
+++ b/generator/generator_ruby.ml
@@ -50,6 +50,15 @@ let rec generate_ruby_c () =
#define RARRAY_LEN(r) (RARRAY((r))->len)
#endif
+/* For Ruby < 1.8 */
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(r) (RSTRING((r))->len)
+#endif
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(r) (RSTRING((r))->ptr)
+#endif
+
static VALUE m_guestfs; /* guestfs module */
static VALUE c_guestfs; /* guestfs_h handle */
static VALUE e_Error; /* used for all errors */
@@ -417,11 +426,11 @@ ruby_user_cancel (VALUE gv)
pr " const char *%s = StringValueCStr (%sv);\n" n n;
| BufferIn n ->
pr " Check_Type (%sv, T_STRING);\n" n;
- pr " const char *%s = RSTRING (%sv)->ptr;\n" n n;
+ pr " const char *%s = RSTRING_PTR (%sv);\n" n n;
pr " if (!%s)\n" n;
pr " rb_raise (rb_eTypeError, \"expected string for parameter %%s of %%s\",\n";
pr " \"%s\", \"%s\");\n" n name;
- pr " size_t %s_size = RSTRING (%sv)->len;\n" n n
+ pr " size_t %s_size = RSTRING_LEN (%sv);\n" n n
| OptString n ->
pr " const char *%s = !NIL_P (%sv) ? StringValueCStr (%sv) : NULL;\n" n n n
| StringList n | DeviceList n ->
diff --git a/gnulib/lib/Makefile.in b/gnulib/lib/Makefile.in
index 137dad0..549eabc 100644
--- a/gnulib/lib/Makefile.in
+++ b/gnulib/lib/Makefile.in
@@ -283,7 +283,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/gnulib/tests/Makefile.in b/gnulib/tests/Makefile.in
index 9e2a0f7..6ff9284 100644
--- a/gnulib/tests/Makefile.in
+++ b/gnulib/tests/Makefile.in
@@ -1170,7 +1170,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/haskell/Makefile.in b/haskell/Makefile.in
index 9e20ccb..b184ae6 100644
--- a/haskell/Makefile.in
+++ b/haskell/Makefile.in
@@ -209,7 +209,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/images/Makefile.in b/images/Makefile.in
index cd00a92..eb635d8 100644
--- a/images/Makefile.in
+++ b/images/Makefile.in
@@ -209,7 +209,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/inspector/Makefile.in b/inspector/Makefile.in
index 639ac68..5d4521b 100644
--- a/inspector/Makefile.in
+++ b/inspector/Makefile.in
@@ -286,7 +286,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/java/Makefile.in b/java/Makefile.in
index 9eeaccf..fdc84af 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -296,7 +296,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/java/examples/Makefile.in b/java/examples/Makefile.in
index 00f9d2e..f7e2b84 100644
--- a/java/examples/Makefile.in
+++ b/java/examples/Makefile.in
@@ -218,7 +218,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/libguestfs.pc b/libguestfs.pc
index 796656d..99b6898 100644
--- a/libguestfs.pc
+++ b/libguestfs.pc
@@ -4,7 +4,7 @@ libdir=${exec_prefix}/lib
includedir=${prefix}/include
Name: libguestfs
-Version: 1.15.9
+Version: 1.15.10
Description: libguestfs library for accessing and modifying VM images
Requires:
Cflags:
diff --git a/ocaml/Makefile.in b/ocaml/Makefile.in
index cbc8757..6e4246d 100644
--- a/ocaml/Makefile.in
+++ b/ocaml/Makefile.in
@@ -214,7 +214,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/ocaml/examples/Makefile.in b/ocaml/examples/Makefile.in
index a736885..63c9a21 100644
--- a/ocaml/examples/Makefile.in
+++ b/ocaml/examples/Makefile.in
@@ -218,7 +218,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/perl/Makefile.in b/perl/Makefile.in
index aede1ca..1d78b62 100644
--- a/perl/Makefile.in
+++ b/perl/Makefile.in
@@ -209,7 +209,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/perl/examples/Makefile.in b/perl/examples/Makefile.in
index 3f98cba..552cbcd 100644
--- a/perl/examples/Makefile.in
+++ b/perl/examples/Makefile.in
@@ -216,7 +216,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/php/Makefile.in b/php/Makefile.in
index 26d9095..00a28c8 100644
--- a/php/Makefile.in
+++ b/php/Makefile.in
@@ -233,7 +233,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/po-docs/Makefile.in b/po-docs/Makefile.in
index 6907bdd..14b33ff 100644
--- a/po-docs/Makefile.in
+++ b/po-docs/Makefile.in
@@ -233,7 +233,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/po-docs/ja/Makefile.in b/po-docs/ja/Makefile.in
index 57500bf..490ff30 100644
--- a/po-docs/ja/Makefile.in
+++ b/po-docs/ja/Makefile.in
@@ -193,7 +193,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/po-docs/ja/guestfish.1 b/po-docs/ja/guestfish.1
index 43c4e1e..1d38a8c 100644
--- a/po-docs/ja/guestfish.1
+++ b/po-docs/ja/guestfish.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfish 1"
-.TH guestfish 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH guestfish 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/guestfs.3 b/po-docs/ja/guestfs.3
index f409147..a6901c7 100644
--- a/po-docs/ja/guestfs.3
+++ b/po-docs/ja/guestfs.3
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfs 3"
-.TH guestfs 3 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH guestfs 3 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/guestmount.1 b/po-docs/ja/guestmount.1
index cd13c86..0314bd7 100644
--- a/po-docs/ja/guestmount.1
+++ b/po-docs/ja/guestmount.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestmount 1"
-.TH guestmount 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH guestmount 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/libguestfs-test-tool.1 b/po-docs/ja/libguestfs-test-tool.1
index bb072ed..ea62be8 100644
--- a/po-docs/ja/libguestfs-test-tool.1
+++ b/po-docs/ja/libguestfs-test-tool.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "libguestfs-test-tool 1"
-.TH libguestfs-test-tool 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH libguestfs-test-tool 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-alignment-scan.1 b/po-docs/ja/virt-alignment-scan.1
index 7b2732d..adee56d 100644
--- a/po-docs/ja/virt-alignment-scan.1
+++ b/po-docs/ja/virt-alignment-scan.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-alignment-scan 1"
-.TH virt-alignment-scan 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-alignment-scan 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-cat.1 b/po-docs/ja/virt-cat.1
index 0ed35c7..c6bc257 100644
--- a/po-docs/ja/virt-cat.1
+++ b/po-docs/ja/virt-cat.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-cat 1"
-.TH virt-cat 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-cat 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-copy-in.1 b/po-docs/ja/virt-copy-in.1
index e5a6299..507da34 100644
--- a/po-docs/ja/virt-copy-in.1
+++ b/po-docs/ja/virt-copy-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-in 1"
-.TH virt-copy-in 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-copy-in 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-copy-out.1 b/po-docs/ja/virt-copy-out.1
index e39471a..1b7b717 100644
--- a/po-docs/ja/virt-copy-out.1
+++ b/po-docs/ja/virt-copy-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-out 1"
-.TH virt-copy-out 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-copy-out 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-df.1 b/po-docs/ja/virt-df.1
index 72d201c..be4842d 100644
--- a/po-docs/ja/virt-df.1
+++ b/po-docs/ja/virt-df.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-df 1"
-.TH virt-df 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-df 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-edit.1 b/po-docs/ja/virt-edit.1
index 27d6403..09050d2 100644
--- a/po-docs/ja/virt-edit.1
+++ b/po-docs/ja/virt-edit.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-edit 1"
-.TH virt-edit 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-edit 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-filesystems.1 b/po-docs/ja/virt-filesystems.1
index 26a0c21..352bcf3 100644
--- a/po-docs/ja/virt-filesystems.1
+++ b/po-docs/ja/virt-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-filesystems 1"
-.TH virt-filesystems 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-filesystems 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-inspector.1 b/po-docs/ja/virt-inspector.1
index 36edd84..c2b1980 100644
--- a/po-docs/ja/virt-inspector.1
+++ b/po-docs/ja/virt-inspector.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-inspector 1"
-.TH virt-inspector 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-inspector 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-list-filesystems.1 b/po-docs/ja/virt-list-filesystems.1
index 3eb0d39..5cc142c 100644
--- a/po-docs/ja/virt-list-filesystems.1
+++ b/po-docs/ja/virt-list-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-filesystems.pl 1"
-.TH virt-list-filesystems.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-list-filesystems.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-list-partitions.1 b/po-docs/ja/virt-list-partitions.1
index a417bf9..2167beb 100644
--- a/po-docs/ja/virt-list-partitions.1
+++ b/po-docs/ja/virt-list-partitions.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-partitions.pl 1"
-.TH virt-list-partitions.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-list-partitions.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-ls.1 b/po-docs/ja/virt-ls.1
index fd14542..6a1c683 100644
--- a/po-docs/ja/virt-ls.1
+++ b/po-docs/ja/virt-ls.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-ls 1"
-.TH virt-ls 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-ls 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-make-fs.1 b/po-docs/ja/virt-make-fs.1
index 12715e4..13ec707 100644
--- a/po-docs/ja/virt-make-fs.1
+++ b/po-docs/ja/virt-make-fs.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-make-fs.pl 1"
-.TH virt-make-fs.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-make-fs.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-rescue.1 b/po-docs/ja/virt-rescue.1
index 32ac9df..58ae8c6 100644
--- a/po-docs/ja/virt-rescue.1
+++ b/po-docs/ja/virt-rescue.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-rescue 1"
-.TH virt-rescue 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-rescue 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-resize.1 b/po-docs/ja/virt-resize.1
index d18f7e8..aa4db88 100644
--- a/po-docs/ja/virt-resize.1
+++ b/po-docs/ja/virt-resize.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-resize 1"
-.TH virt-resize 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-resize 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-sparsify.1 b/po-docs/ja/virt-sparsify.1
index dc14b6a..88629e9 100644
--- a/po-docs/ja/virt-sparsify.1
+++ b/po-docs/ja/virt-sparsify.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sparsify 1"
-.TH virt-sparsify 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-sparsify 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-sysprep.1 b/po-docs/ja/virt-sysprep.1
index 5aa6583..45cf970 100644
--- a/po-docs/ja/virt-sysprep.1
+++ b/po-docs/ja/virt-sysprep.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sysprep 1"
-.TH virt-sysprep 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-sysprep 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-tar-in.1 b/po-docs/ja/virt-tar-in.1
index bbe7b6d..fe7f3b6 100644
--- a/po-docs/ja/virt-tar-in.1
+++ b/po-docs/ja/virt-tar-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-in 1"
-.TH virt-tar-in 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-tar-in 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-tar-out.1 b/po-docs/ja/virt-tar-out.1
index 7a5fb3e..f1693b1 100644
--- a/po-docs/ja/virt-tar-out.1
+++ b/po-docs/ja/virt-tar-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-out 1"
-.TH virt-tar-out 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-tar-out 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-tar.1 b/po-docs/ja/virt-tar.1
index 05138b7..efe4b87 100644
--- a/po-docs/ja/virt-tar.1
+++ b/po-docs/ja/virt-tar.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar.pl 1"
-.TH virt-tar.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-tar.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/ja/virt-win-reg.1 b/po-docs/ja/virt-win-reg.1
index 9220f9b..d55048f 100644
--- a/po-docs/ja/virt-win-reg.1
+++ b/po-docs/ja/virt-win-reg.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-win-reg.pl 1"
-.TH virt-win-reg.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-win-reg.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 68b5091..43c39ee 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.15.9\n"
+"Project-Id-Version: libguestfs 1.15.10\n"
"Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2011-12-03 11:24+0000\n"
+"POT-Creation-Date: 2011-12-06 15:09+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po-docs/uk/Makefile.in b/po-docs/uk/Makefile.in
index b25f499..3d9e44c 100644
--- a/po-docs/uk/Makefile.in
+++ b/po-docs/uk/Makefile.in
@@ -193,7 +193,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/po-docs/uk/guestfish.1 b/po-docs/uk/guestfish.1
index 83f646a..f800901 100644
--- a/po-docs/uk/guestfish.1
+++ b/po-docs/uk/guestfish.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfish 1"
-.TH guestfish 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH guestfish 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/guestfs.3 b/po-docs/uk/guestfs.3
index 09712d9..94e99f1 100644
--- a/po-docs/uk/guestfs.3
+++ b/po-docs/uk/guestfs.3
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestfs 3"
-.TH guestfs 3 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH guestfs 3 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/guestmount.1 b/po-docs/uk/guestmount.1
index f5c8262..26215e0 100644
--- a/po-docs/uk/guestmount.1
+++ b/po-docs/uk/guestmount.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "guestmount 1"
-.TH guestmount 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH guestmount 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/libguestfs-test-tool.1 b/po-docs/uk/libguestfs-test-tool.1
index e78c29b..5d247dd 100644
--- a/po-docs/uk/libguestfs-test-tool.1
+++ b/po-docs/uk/libguestfs-test-tool.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "libguestfs-test-tool 1"
-.TH libguestfs-test-tool 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH libguestfs-test-tool 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-alignment-scan.1 b/po-docs/uk/virt-alignment-scan.1
index 026fba6..23464a9 100644
--- a/po-docs/uk/virt-alignment-scan.1
+++ b/po-docs/uk/virt-alignment-scan.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-alignment-scan 1"
-.TH virt-alignment-scan 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-alignment-scan 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-cat.1 b/po-docs/uk/virt-cat.1
index 41a93e3..48dd6fd 100644
--- a/po-docs/uk/virt-cat.1
+++ b/po-docs/uk/virt-cat.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-cat 1"
-.TH virt-cat 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-cat 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-copy-in.1 b/po-docs/uk/virt-copy-in.1
index 99b4f84..90b5ea6 100644
--- a/po-docs/uk/virt-copy-in.1
+++ b/po-docs/uk/virt-copy-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-in 1"
-.TH virt-copy-in 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-copy-in 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-copy-out.1 b/po-docs/uk/virt-copy-out.1
index 17a4b90..57001d5 100644
--- a/po-docs/uk/virt-copy-out.1
+++ b/po-docs/uk/virt-copy-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-copy-out 1"
-.TH virt-copy-out 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-copy-out 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-df.1 b/po-docs/uk/virt-df.1
index e4a22ee..bc10d18 100644
--- a/po-docs/uk/virt-df.1
+++ b/po-docs/uk/virt-df.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-df 1"
-.TH virt-df 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-df 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-edit.1 b/po-docs/uk/virt-edit.1
index 74ef0d1..1fe5946 100644
--- a/po-docs/uk/virt-edit.1
+++ b/po-docs/uk/virt-edit.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-edit 1"
-.TH virt-edit 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-edit 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-filesystems.1 b/po-docs/uk/virt-filesystems.1
index 004c34c..5b2f65b 100644
--- a/po-docs/uk/virt-filesystems.1
+++ b/po-docs/uk/virt-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-filesystems 1"
-.TH virt-filesystems 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-filesystems 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-inspector.1 b/po-docs/uk/virt-inspector.1
index 8532328..a3581f4 100644
--- a/po-docs/uk/virt-inspector.1
+++ b/po-docs/uk/virt-inspector.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-inspector 1"
-.TH virt-inspector 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-inspector 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-list-filesystems.1 b/po-docs/uk/virt-list-filesystems.1
index 1de68c3..b726e48 100644
--- a/po-docs/uk/virt-list-filesystems.1
+++ b/po-docs/uk/virt-list-filesystems.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-filesystems.pl 1"
-.TH virt-list-filesystems.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-list-filesystems.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-list-partitions.1 b/po-docs/uk/virt-list-partitions.1
index 9b5051e..503fecf 100644
--- a/po-docs/uk/virt-list-partitions.1
+++ b/po-docs/uk/virt-list-partitions.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-list-partitions.pl 1"
-.TH virt-list-partitions.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-list-partitions.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-ls.1 b/po-docs/uk/virt-ls.1
index 6c2fc90..c2ca2a0 100644
--- a/po-docs/uk/virt-ls.1
+++ b/po-docs/uk/virt-ls.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-ls 1"
-.TH virt-ls 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-ls 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-make-fs.1 b/po-docs/uk/virt-make-fs.1
index fd28dcd..6dd272e 100644
--- a/po-docs/uk/virt-make-fs.1
+++ b/po-docs/uk/virt-make-fs.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-make-fs.pl 1"
-.TH virt-make-fs.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-make-fs.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-rescue.1 b/po-docs/uk/virt-rescue.1
index e232d9e..0bd3764 100644
--- a/po-docs/uk/virt-rescue.1
+++ b/po-docs/uk/virt-rescue.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-rescue 1"
-.TH virt-rescue 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-rescue 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-resize.1 b/po-docs/uk/virt-resize.1
index 24f40b7..dd2babf 100644
--- a/po-docs/uk/virt-resize.1
+++ b/po-docs/uk/virt-resize.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-resize 1"
-.TH virt-resize 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-resize 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-sparsify.1 b/po-docs/uk/virt-sparsify.1
index 0680ee2..143b6c9 100644
--- a/po-docs/uk/virt-sparsify.1
+++ b/po-docs/uk/virt-sparsify.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sparsify 1"
-.TH virt-sparsify 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-sparsify 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-sysprep.1 b/po-docs/uk/virt-sysprep.1
index e2b237a..2a69c70 100644
--- a/po-docs/uk/virt-sysprep.1
+++ b/po-docs/uk/virt-sysprep.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-sysprep 1"
-.TH virt-sysprep 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-sysprep 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-tar-in.1 b/po-docs/uk/virt-tar-in.1
index d3cb59b..2711de3 100644
--- a/po-docs/uk/virt-tar-in.1
+++ b/po-docs/uk/virt-tar-in.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-in 1"
-.TH virt-tar-in 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-tar-in 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-tar-out.1 b/po-docs/uk/virt-tar-out.1
index 45cf162..a45a53d 100644
--- a/po-docs/uk/virt-tar-out.1
+++ b/po-docs/uk/virt-tar-out.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar-out 1"
-.TH virt-tar-out 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-tar-out 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-tar.1 b/po-docs/uk/virt-tar.1
index 9d93a21..cba055c 100644
--- a/po-docs/uk/virt-tar.1
+++ b/po-docs/uk/virt-tar.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-tar.pl 1"
-.TH virt-tar.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-tar.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po-docs/uk/virt-win-reg.1 b/po-docs/uk/virt-win-reg.1
index acef3f0..a4c6c5b 100644
--- a/po-docs/uk/virt-win-reg.1
+++ b/po-docs/uk/virt-win-reg.1
@@ -62,7 +62,7 @@
.\" ========================================================================
.\"
.IX Title "virt-win-reg.pl 1"
-.TH virt-win-reg.pl 1 "2011-12-03" "libguestfs-1.15.9" "Virtualization Support"
+.TH virt-win-reg.pl 1 "2011-12-06" "libguestfs-1.15.10" "Virtualization Support"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/po/en_GB.gmo b/po/en_GB.gmo
index 6a4cd20..0f1410f 100644
Binary files a/po/en_GB.gmo and b/po/en_GB.gmo differ
diff --git a/po/en_GB.po b/po/en_GB.po
index c432c22..933612e 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.net/projects/p/"
diff --git a/po/es.gmo b/po/es.gmo
index 61a6ce1..db5b932 100644
Binary files a/po/es.gmo and b/po/es.gmo differ
diff --git a/po/es.po b/po/es.po
index 792d003..7615d26 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Spanish (Castilian) <trans-es at lists.fedoraproject.org>\n"
diff --git a/po/gu.gmo b/po/gu.gmo
index 6407c94..9b2a0c4 100644
Binary files a/po/gu.gmo and b/po/gu.gmo differ
diff --git a/po/gu.po b/po/gu.po
index 91e53a2..6cf99ca 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Gujarati <trans-gu at lists.fedoraproject.org>\n"
diff --git a/po/hi.gmo b/po/hi.gmo
index e8bbdc5..44f1132 100644
Binary files a/po/hi.gmo and b/po/hi.gmo differ
diff --git a/po/hi.po b/po/hi.po
index 07ec9e1..8898f23 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Hindi <indlinux-hindi at lists.sourceforge.net>\n"
diff --git a/po/kn.gmo b/po/kn.gmo
index df4245e..906e198 100644
Binary files a/po/kn.gmo and b/po/kn.gmo differ
diff --git a/po/kn.po b/po/kn.po
index d3d00d2..1505bcf 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Kannada (http://www.transifex.net/projects/p/fedora/team/"
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 48b9618..b7bb092 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: libguestfs 1.15.9\n"
+"Project-Id-Version: libguestfs 1.15.10\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
diff --git a/po/ml.gmo b/po/ml.gmo
index d2e52d0..ea1bfc9 100644
Binary files a/po/ml.gmo and b/po/ml.gmo differ
diff --git a/po/ml.po b/po/ml.po
index 79416cf..52ab697 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Malayalam <discuss at lists.smc.org.in>\n"
diff --git a/po/mr.gmo b/po/mr.gmo
index d509a1a..c7a5ae7 100644
Binary files a/po/mr.gmo and b/po/mr.gmo differ
diff --git a/po/mr.po b/po/mr.po
index 8cc0016..c935e4e 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Marathi (http://www.transifex.net/projects/p/fedora/team/"
diff --git a/po/nl.gmo b/po/nl.gmo
index 972118f..558ede7 100644
Binary files a/po/nl.gmo and b/po/nl.gmo differ
diff --git a/po/nl.po b/po/nl.po
index f6a3628..80d063d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Dutch (http://www.transifex.net/projects/p/fedora/team/nl/)\n"
diff --git a/po/or.gmo b/po/or.gmo
index a34be23..5d9e14c 100644
Binary files a/po/or.gmo and b/po/or.gmo differ
diff --git a/po/or.po b/po/or.po
index f28294f..99707ab 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Oriya (http://www.transifex.net/projects/p/fedora/team/or/)\n"
diff --git a/po/pa.gmo b/po/pa.gmo
index f96d379..9578ec5 100644
Binary files a/po/pa.gmo and b/po/pa.gmo differ
diff --git a/po/pa.po b/po/pa.po
index 99db007..cb3c573 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Panjabi (Punjabi) <punjabi-users at lists.sf.net>\n"
diff --git a/po/pl.gmo b/po/pl.gmo
index ee71168..f885de7 100644
Binary files a/po/pl.gmo and b/po/pl.gmo differ
diff --git a/po/pl.po b/po/pl.po
index 1c977e2..a105336 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/fedora/team/pl/)\n"
diff --git a/po/ta.gmo b/po/ta.gmo
index c440d5b..c7c9670 100644
Binary files a/po/ta.gmo and b/po/ta.gmo differ
diff --git a/po/ta.po b/po/ta.po
index bb3a77d..bf8586a 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Tamil <tamil-users at lists.fedoraproject.org>\n"
diff --git a/po/te.gmo b/po/te.gmo
index dd091bd..234c9ec 100644
Binary files a/po/te.gmo and b/po/te.gmo differ
diff --git a/po/te.po b/po/te.po
index e725b2e..8b6f44e 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Telugu (http://www.transifex.net/projects/p/fedora/team/te/)\n"
diff --git a/po/uk.gmo b/po/uk.gmo
index cdaa23a..17417c5 100644
Binary files a/po/uk.gmo and b/po/uk.gmo differ
diff --git a/po/uk.po b/po/uk.po
index 6b50857..300f688 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: libguestfs\n"
"Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
"component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2011-12-03 11:23+0000\n"
+"POT-Creation-Date: 2011-12-06 15:08+0000\n"
"PO-Revision-Date: 2011-10-27 09:11+0000\n"
"Last-Translator: rjones <rjones at redhat.com>\n"
"Language-Team: Ukrainian <trans-uk at lists.fedoraproject.org>\n"
diff --git a/python/Makefile.in b/python/Makefile.in
index 96bf88b..39b93dd 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -273,7 +273,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/python/examples/Makefile.in b/python/examples/Makefile.in
index 53619f1..1cb0176 100644
--- a/python/examples/Makefile.in
+++ b/python/examples/Makefile.in
@@ -216,7 +216,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/regressions/Makefile.in b/regressions/Makefile.in
index c7807fe..4a0d9a6 100644
--- a/regressions/Makefile.in
+++ b/regressions/Makefile.in
@@ -263,7 +263,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/rescue/Makefile.in b/rescue/Makefile.in
index 982b748..2eb35e7 100644
--- a/rescue/Makefile.in
+++ b/rescue/Makefile.in
@@ -274,7 +274,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/resize/Makefile.in b/resize/Makefile.in
index 1a2d9ec..ba9f242 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -239,7 +239,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/ruby/Makefile.in b/ruby/Makefile.in
index 15e117f..54813ef 100644
--- a/ruby/Makefile.in
+++ b/ruby/Makefile.in
@@ -209,7 +209,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/ruby/examples/Makefile.in b/ruby/examples/Makefile.in
index 72e3cf0..f1cec31 100644
--- a/ruby/examples/Makefile.in
+++ b/ruby/examples/Makefile.in
@@ -216,7 +216,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/ruby/ext/guestfs/_guestfs.c b/ruby/ext/guestfs/_guestfs.c
index 49c4046..b048896 100644
--- a/ruby/ext/guestfs/_guestfs.c
+++ b/ruby/ext/guestfs/_guestfs.c
@@ -35,6 +35,15 @@
#define RARRAY_LEN(r) (RARRAY((r))->len)
#endif
+/* For Ruby < 1.8 */
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(r) (RSTRING((r))->len)
+#endif
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(r) (RSTRING((r))->ptr)
+#endif
+
static VALUE m_guestfs; /* guestfs module */
static VALUE c_guestfs; /* guestfs_h handle */
static VALUE e_Error; /* used for all errors */
@@ -344,11 +353,11 @@ ruby_guestfs_test0 (VALUE gv, VALUE strv, VALUE optstrv, VALUE strlistv, VALUE b
const char *filein = StringValueCStr (fileinv);
const char *fileout = StringValueCStr (fileoutv);
Check_Type (bufferinv, T_STRING);
- const char *bufferin = RSTRING (bufferinv)->ptr;
+ const char *bufferin = RSTRING_PTR (bufferinv);
if (!bufferin)
rb_raise (rb_eTypeError, "expected string for parameter %s of %s",
"bufferin", "test0");
- size_t bufferin_size = RSTRING (bufferinv)->len;
+ size_t bufferin_size = RSTRING_LEN (bufferinv);
int r;
@@ -14411,11 +14420,11 @@ ruby_guestfs_write (VALUE gv, VALUE pathv, VALUE contentv)
const char *path = StringValueCStr (pathv);
Check_Type (contentv, T_STRING);
- const char *content = RSTRING (contentv)->ptr;
+ const char *content = RSTRING_PTR (contentv);
if (!content)
rb_raise (rb_eTypeError, "expected string for parameter %s of %s",
"content", "write");
- size_t content_size = RSTRING (contentv)->len;
+ size_t content_size = RSTRING_LEN (contentv);
int r;
@@ -14463,11 +14472,11 @@ ruby_guestfs_pwrite (VALUE gv, VALUE pathv, VALUE contentv, VALUE offsetv)
const char *path = StringValueCStr (pathv);
Check_Type (contentv, T_STRING);
- const char *content = RSTRING (contentv)->ptr;
+ const char *content = RSTRING_PTR (contentv);
if (!content)
rb_raise (rb_eTypeError, "expected string for parameter %s of %s",
"content", "pwrite");
- size_t content_size = RSTRING (contentv)->len;
+ size_t content_size = RSTRING_LEN (contentv);
long long offset = NUM2LL (offsetv);
int r;
@@ -15570,11 +15579,11 @@ ruby_guestfs_pwrite_device (VALUE gv, VALUE devicev, VALUE contentv, VALUE offse
const char *device = StringValueCStr (devicev);
Check_Type (contentv, T_STRING);
- const char *content = RSTRING (contentv)->ptr;
+ const char *content = RSTRING_PTR (contentv);
if (!content)
rb_raise (rb_eTypeError, "expected string for parameter %s of %s",
"content", "pwrite_device");
- size_t content_size = RSTRING (contentv)->len;
+ size_t content_size = RSTRING_LEN (contentv);
long long offset = NUM2LL (offsetv);
int r;
@@ -16290,11 +16299,11 @@ ruby_guestfs_write_append (VALUE gv, VALUE pathv, VALUE contentv)
const char *path = StringValueCStr (pathv);
Check_Type (contentv, T_STRING);
- const char *content = RSTRING (contentv)->ptr;
+ const char *content = RSTRING_PTR (contentv);
if (!content)
rb_raise (rb_eTypeError, "expected string for parameter %s of %s",
"content", "write_append");
- size_t content_size = RSTRING (contentv)->len;
+ size_t content_size = RSTRING_LEN (contentv);
int r;
diff --git a/sparsify/Makefile.in b/sparsify/Makefile.in
index 68b7606..102154a 100644
--- a/sparsify/Makefile.in
+++ b/sparsify/Makefile.in
@@ -239,7 +239,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/src/Makefile.am b/src/Makefile.am
index 82a4004..28a1b92 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,7 +171,7 @@ if HAVE_RPCGEN
guestfs_protocol.c: guestfs_protocol.x
rm -f $@-t $@-t2
$(RPCGEN) -c -o $@-t $(srcdir)/$<
- sed 's,\.\./\.\./src/,,' < $@-t > $@-t2
+ sed 's,\.\./\(\.\./\)*src,.,' < $@-t > $@-t2
rm $@-t
mv $@-t2 $@
diff --git a/src/Makefile.in b/src/Makefile.in
index 9d7a10d..a8cf8ff 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -231,11 +231,12 @@ am__DEPENDENCIES_1 =
libguestfs_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- ../gnulib/lib/libgnu.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) ../gnulib/lib/libgnu.la \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) liberrnostring.la libprotocol.la
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) liberrnostring.la \
+ libprotocol.la
am_libguestfs_la_OBJECTS = libguestfs_la-guestfs.lo \
libguestfs_la-actions.lo libguestfs_la-appliance.lo \
libguestfs_la-bindtests.lo libguestfs_la-dbdump.lo \
@@ -305,7 +306,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2056,7 +2058,7 @@ errnostring_gperf.c: errnostring_gperf.gperf
@HAVE_RPCGEN_TRUE at guestfs_protocol.c: guestfs_protocol.x
@HAVE_RPCGEN_TRUE@ rm -f $@-t $@-t2
@HAVE_RPCGEN_TRUE@ $(RPCGEN) -c -o $@-t $(srcdir)/$<
- at HAVE_RPCGEN_TRUE@ sed 's,\.\./\.\./src/,,' < $@-t > $@-t2
+ at HAVE_RPCGEN_TRUE@ sed 's,\.\./\(\.\./\)*src,.,' < $@-t > $@-t2
@HAVE_RPCGEN_TRUE@ rm $@-t
@HAVE_RPCGEN_TRUE@ mv $@-t2 $@
diff --git a/test-tool/Makefile.in b/test-tool/Makefile.in
index fb5609e..ab60fd1 100644
--- a/test-tool/Makefile.in
+++ b/test-tool/Makefile.in
@@ -268,7 +268,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index bd24af8..b8a8818 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -238,7 +238,8 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
AR = @AR@
ARFLAGS = @ARFLAGS@
-AUGEAS_LIB = @AUGEAS_LIB@
+AUGEAS_CFLAGS = @AUGEAS_CFLAGS@
+AUGEAS_LIBS = @AUGEAS_LIBS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
--
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