Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > media > main-src > by-pkgid > aadbe78a25743146bb784eee19f007c5 > files > 589

kvm-83-164.el5_5.9.src.rpm

From 3dd5ca1f825f5319186202d350b3b43d4aa3bc3a Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Fri, 2 Oct 2009 16:51:30 -0300
Subject: [PATCH 7/7] usb_bluez depends of bluez

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <b342e75d5bf858e3ccedca11e7eeb948fec21037.1253622110.git.quintela@redhat.com>
Patchwork-id: 3492
O-Subject: [PATCH 2/2] usb_bluez depends of bluez
Bugzilla: 516672
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>

v2: usb variable on configure don't mean enable/disable usb, it means
    if usb is linux/bsd/none.
    Once there, only print the usb_bluez line if bluez is enabled

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/configure |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/configure |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/qemu/configure b/qemu/configure
index 714d312..afa87d8 100755
--- a/qemu/configure
+++ b/qemu/configure
@@ -1402,11 +1402,13 @@ echo "USB storage       $usb_msd"
 echo "USB wacom         $usb_wacom"
 echo "USB serial        $usb_serial"
 echo "USB net           $usb_net"
-echo "USB bluez         $usb_bluez"
 echo "VMware drivers    $vmware"
 echo "NBD support       $nbd"
 echo "PCSPK support     $pcspk"
 echo "bluetooth support $bluez"
+if test "$bluez" = "yes" ; then
+  echo "  USB bluez         $usb_bluez"
+fi
 echo "Only generic cpus $x86_only_generic_cpus"
 
 if test $sdl_too_old = "yes"; then
@@ -1723,7 +1725,7 @@ if test "$usb_net" = "yes" ; then
   echo "CONFIG_USB_NET=yes" >> $config_mak
   echo "#define CONFIG_USB_NET 1" >> $config_h
 fi
-if test "$usb_bluez" = "yes" ; then
+if test "$bluez" = "yes" -a "$usb_bluez" = "yes" ; then
   echo "CONFIG_USB_BLUEZ=yes" >> $config_mak
   echo "#define CONFIG_USB_BLUEZ 1" >> $config_h
 fi
-- 
1.6.3.rc4.29.g8146