git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: fix test for --nocompress option
[libguestfs.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
bc60608
..
6bdf7d4
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-18,7
+18,7
@@
# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [0])
# major/minor/release must be numbers
m4_define([libguestfs_major], [1])
m4_define([libguestfs_minor], [0])
-m4_define([libguestfs_release], [6
2
])
+m4_define([libguestfs_release], [6
5
])
# extra can be any string
m4_define([libguestfs_extra], [])
# extra can be any string
m4_define([libguestfs_extra], [])
@@
-91,7
+91,7
@@
dnl Check that the chosen qemu has vmchannel support.
dnl http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html
if test "x$vmchannel_test" != "xno"; then
AC_MSG_CHECKING([for "guestfwd" support in $QEMU])
dnl http://lists.gnu.org/archive/html/qemu-devel/2009-02/msg01042.html
if test "x$vmchannel_test" != "xno"; then
AC_MSG_CHECKING([for "guestfwd" support in $QEMU])
- if
qemu-kvm
--help | grep -sq guestfwd; then
+ if
$QEMU
--help | grep -sq guestfwd; then
AC_MSG_RESULT([yes])
else
AC_MSG_CHECKING([for "-net channel" support in $QEMU])
AC_MSG_RESULT([yes])
else
AC_MSG_CHECKING([for "-net channel" support in $QEMU])
@@
-264,7
+264,7
@@
version of febootstrap.
AC_MSG_CHECKING([for --nocompress support in $FEBOOTSTRAP_TO_INITRAMFS])
out=`$FEBOOTSTRAP_TO_INITRAMFS 2>&1 ||:`
echo "febootstrap_to_initramfs test command output: $out" >&AS_MESSAGE_LOG_FD
AC_MSG_CHECKING([for --nocompress support in $FEBOOTSTRAP_TO_INITRAMFS])
out=`$FEBOOTSTRAP_TO_INITRAMFS 2>&1 ||:`
echo "febootstrap_to_initramfs test command output: $out" >&AS_MESSAGE_LOG_FD
- if ! echo
$out | grep -sq -- "--nocompress"
; then
+ if ! echo
"$out" | grep -sq -e --nocompress
; then
AC_MSG_RESULT([no])
AC_MSG_FAILURE(
[febootstrap-to-initramfs does not support the --nocompress option.
AC_MSG_RESULT([no])
AC_MSG_FAILURE(
[febootstrap-to-initramfs does not support the --nocompress option.