]> xenbits.xensource.com Git - libvirt.git/commitdiff
configure: move qemu bridge helper check to qemu driver file
authorPavel Hrdina <phrdina@redhat.com>
Mon, 12 Dec 2016 17:18:30 +0000 (18:18 +0100)
committerPavel Hrdina <phrdina@redhat.com>
Wed, 21 Dec 2016 14:39:41 +0000 (15:39 +0100)
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
configure.ac
m4/virt-driver-qemu.m4

index 4a06e73a4f27202d9759dacaff040a35a6e330ea..b582a7814e1f33f9dc5a2cdc5c7b5c527730e71b 100644 (file)
@@ -1500,10 +1500,6 @@ fi
 AM_CONDITIONAL([WITH_INTERFACE], [test "$with_interface" = "yes"])
 
 
-AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper], [/usr/libexec/qemu-bridge-helper],
-                  [/usr/libexec:/usr/lib/qemu:/usr/lib])
-AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"], [QEMU bridge helper])
-
 dnl GET_VLAN_VID_CMD is required for virNetDevGetVLanID
 AC_CHECK_DECLS([GET_VLAN_VID_CMD], [], [], [[#include <linux/if_vlan.h>]])
 
index 9e65e85364c5137dad32d336518627feaaba2b99..6586be0b152fa8c9f77d80ce3cfa9681d157d8ca 100644 (file)
@@ -51,6 +51,12 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_QEMU], [
   fi
   AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account])
   AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account])
+
+  AC_PATH_PROG([QEMU_BRIDGE_HELPER], [qemu-bridge-helper],
+               [/usr/libexec/qemu-bridge-helper],
+               [/usr/libexec:/usr/lib/qemu:/usr/lib])
+  AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"],
+                     [QEMU bridge helper])
 ])
 
 AC_DEFUN([LIBVIRT_DRIVER_RESULT_QEMU], [