From: Roger Pau Monne <roger.pau@citrix.com>
Date: Mon, 2 Jun 2014 15:08:08 +0000 (+0200)
Subject: configure: disable qemu-trad on FreeBSD systems by default
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4826
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b57af88ceaec43a846682a93842331dca4d2a312;p=xen.git

configure: disable qemu-trad on FreeBSD systems by default

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 ]
---

diff --git a/tools/configure b/tools/configure
index ea2ad80db5..80a74e310d 100755
--- a/tools/configure
+++ b/tools/configure
@@ -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
 
diff --git a/tools/configure.ac b/tools/configure.ac
index 89f1ac7f1d..282dbc4cd8 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -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])