[libvirt] [PATCH 56/89] configure: move qemu bridge helper check to qemu driver file
Signed-off-by: Pavel Hrdina <phrdina(a)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 b41aad4905..7713dab82f 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], [
--
2.11.0