X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;h=24de0926944ca57ac63dd01bcfaba8d357983c01;hp=456ed4d74c92354f55c10b7eeda3bfaa0838f985;hb=43ab6dfdf38fdafa040b9e9c1665295765f1486c;hpb=d82438431c1551610eb7d9945fa76d6387534582

diff --git a/configure.ac b/configure.ac
index 456ed4d..24de092 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,8 +17,8 @@
 
 # major/minor/release must be numbers
 m4_define([libguestfs_major],   [1])
-m4_define([libguestfs_minor],   [11])
-m4_define([libguestfs_release], [20])
+m4_define([libguestfs_minor],   [13])
+m4_define([libguestfs_release], [0])
 # extra can be any string
 m4_define([libguestfs_extra],   [])
 
@@ -107,6 +107,8 @@ if test "$gl_gcc_warnings" = yes; then
                                     # by Python, Ruby and xstrtoll.
   nw="$nw -Wstack-protector"        # Don't warn about stack-protector
                                     # failures (seen on Ubuntu).
+  nw="$nw -Wmissing-noreturn"       # Don't warn about missed noreturn funcs
+                                    # (seen on Ubuntu).
 
   gl_MANYWARN_ALL_GCC([ws])
   gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw])
@@ -323,18 +325,8 @@ working.
 ])
     fi
 
-    # qemu since 0.15 requires the -machine accel=tcg option, otherwise
-    # it won't start up.  QEMU DEVELOPERS, PLEASE ADD CAPABILITIES TESTING.
-    AC_MSG_CHECKING([if this qemu has the -machine accel=tcg option])
-    if $QEMU -help 2>&1 | grep -sq -- '-machine.*accel.*tcg'; then
-        qemu_machine_accel_tcg="-machine accel=tcg"
-        AC_MSG_RESULT([$qemu_machine_accel_tcg])
-    else
-        AC_MSG_RESULT([no])
-    fi
-
     AC_MSG_CHECKING([for virtio-serial support in $QEMU])
-    if $QEMU $qemu_machine_accel_tcg -nographic -device \? 2>&1 | grep -sq virtio-serial; then
+    if $QEMU -nographic -device \? 2>&1 | grep -sq virtio-serial; then
         AC_MSG_RESULT([yes])
     else
         AC_MSG_RESULT([no])