configure: disable qemu-trad on FreeBSD systems by default
authorRoger Pau Monne <roger.pau@citrix.com>
Mon, 2 Jun 2014 15:08:08 +0000 (17:08 +0200)
committerIan Campbell <ian.campbell@citrix.com>
Wed, 18 Jun 2014 16:13:14 +0000 (17:13 +0100)
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
[ ijc -- ran autogen.sh ]

tools/configure
tools/configure.ac

index ea2ad80db528d188c2beb091c7d7193b55627286..80a74e310d1415b48a5fc2fd556a33968ed0735f 100755 (executable)
@@ -1427,7 +1427,7 @@ Optional Features:
   --enable-blktap1        Enable blktap1 tools (default is DISABLED)
   --enable-qemu-traditional
                           Enable qemu traditional device model, (DEFAULT is on
-                          for x86, otherwise off)
+                          for Linux or NetBSD x86, otherwise off)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3756,6 +3756,11 @@ else
            enable_qemu_traditional="yes";;
         *) enable_qemu_traditional="no";;
     esac
+    case "$host_os" in
+        freebsd*)
+           enable_qemu_traditional="no";;
+    esac
+
 
 fi
 
index 89f1ac7f1dd27299d7ca3f5af6a7a83a26d8da16..282dbc4cd8959217a57e18d762e27e8c442b3d0b 100644 (file)
@@ -61,12 +61,17 @@ AX_ARG_DEFAULT_DISABLE([blktap1], [Enable blktap1 tools])
 
 AC_ARG_ENABLE([qemu-traditional],
     AS_HELP_STRING([--enable-qemu-traditional],
-                   [Enable qemu traditional device model, (DEFAULT is on for x86, otherwise off)]),,[
+                   [Enable qemu traditional device model, (DEFAULT is on for Linux or NetBSD x86, otherwise off)]),,[
     case "$host_cpu" in
         i[[3456]]86|x86_64)
            enable_qemu_traditional="yes";;
         *) enable_qemu_traditional="no";;
     esac
+    case "$host_os" in
+        freebsd*)
+           enable_qemu_traditional="no";;
+    esac
+
 ])
 AS_IF([test "x$enable_qemu_traditional" = "xyes"], [
 AC_DEFINE([HAVE_QEMU_TRADITIONAL], [1], [Qemu traditional enabled])