From 68649d10076d9d866cbd35fb99cbcaa8b0fe2024 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina <phrdina@redhat.com> Date: Mon, 12 Dec 2016 18:18:30 +0100 Subject: [PATCH] configure: move qemu bridge helper check to qemu driver file Signed-off-by: Pavel Hrdina <phrdina@redhat.com> --- configure.ac | 4 ---- m4/virt-driver-qemu.m4 | 6 ++++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 4a06e73a4f..b582a7814e 100644 --- a/configure.ac +++ b/configure.ac @@ -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>]]) diff --git a/m4/virt-driver-qemu.m4 b/m4/virt-driver-qemu.m4 index 9e65e85364..6586be0b15 100644 --- a/m4/virt-driver-qemu.m4 +++ b/m4/virt-driver-qemu.m4 @@ -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], [ -- GitLab