build: If guestfwd test fails, need to print AC_MSG_RESULT 'no'

[libguestfs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1bc1109..16e16c8 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])
-m4_define([libguestfs_release], [62])
+m4_define([libguestfs_release], [65])
 # extra can be any string
 m4_define([libguestfs_extra],   [])
 
@@ -91,9 +91,10 @@ 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])
-    if qemu-kvm --help | grep -sq guestfwd; then
+    if $QEMU --help | grep -sq guestfwd; then
         AC_MSG_RESULT([yes])
     else
+        AC_MSG_RESULT([no])
         AC_MSG_CHECKING([for "-net channel" support in $QEMU])
        vmchannelout=`$QEMU -net channel /dev/zero 2>&1 ||:`
        echo "vmchannel test command output: $vmchannelout" >&AS_MESSAGE_LOG_FD
@@ -248,7 +249,7 @@ if test "x$enable_supermin" = "xyes"; then
     AC_MSG_CHECKING([for --files 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 -- "--files" ; then
+    if ! echo "$out" | grep -sq -e --files ; then
         AC_MSG_RESULT([no])
        AC_MSG_FAILURE(
 [febootstrap-to-initramfs does not support the --files option.
@@ -264,7 +265,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
-    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.
@@ -574,6 +575,7 @@ AC_CONFIG_FILES([Makefile
                 images/Makefile
                 capitests/Makefile
                 regressions/Makefile
+                test-tool/Makefile
                 ocaml/Makefile ocaml/examples/Makefile
                 perl/Makefile
                 python/Makefile