From 32af9539a333a7432a2f322d9011521992bc6454 Mon Sep 17 00:00:00 2001 From: Pavel Hrdina Date: Thu, 8 Dec 2016 10:35:30 +0100 Subject: [PATCH] configure: move QEMU driver check to its own file Signed-off-by: Pavel Hrdina --- configure.ac | 9 +++------ m4/virt-driver-qemu.m4 | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 m4/virt-driver-qemu.m4 diff --git a/configure.ac b/configure.ac index 4ef812edf2..2099171fb8 100644 --- a/configure.ac +++ b/configure.ac @@ -400,7 +400,7 @@ fi dnl Allow to build without Xen, QEMU/KVM, test or remote driver LIBVIRT_ARG_WITH([XEN], [XEN], [check]) LIBVIRT_ARG_WITH([XEN_INOTIFY], [XEN inotify], [check]) -LIBVIRT_ARG_WITH([QEMU], [QEMU/KVM], [yes]) +LIBVIRT_DRIVER_ARG_QEMU LIBVIRT_DRIVER_ARG_OPENVZ LIBVIRT_DRIVER_ARG_VMWARE LIBVIRT_ARG_WITH([PHYP], [PHYP], [check]) @@ -476,10 +476,7 @@ if test "x$with_vbox" = "xyes"; then fi AM_CONDITIONAL([WITH_VBOX], [test "$with_vbox" = "yes"]) -if test "$with_qemu" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_QEMU], 1, [whether QEMU driver is enabled]) -fi -AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"]) +LIBVIRT_DRIVER_CHECK_QEMU if test "$with_test" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled]) @@ -1665,7 +1662,7 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Xen: $with_xen]) -AC_MSG_NOTICE([ QEMU: $with_qemu]) +LIBVIRT_DRIVER_RESULT_QEMU LIBVIRT_DRIVER_RESULT_UML LIBVIRT_DRIVER_RESULT_OPENVZ LIBVIRT_DRIVER_RESULT_VMWARE diff --git a/m4/virt-driver-qemu.m4 b/m4/virt-driver-qemu.m4 new file mode 100644 index 0000000000..39ec73bfef --- /dev/null +++ b/m4/virt-driver-qemu.m4 @@ -0,0 +1,33 @@ +dnl The QEMU driver +dnl +dnl Copyright (C) 2016 Red Hat, Inc. +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License, or (at your option) any later version. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library. If not, see +dnl . +dnl + +AC_DEFUN([LIBVIRT_DRIVER_ARG_QEMU], [ + LIBVIRT_ARG_WITH([QEMU], [QEMU/KVM], [yes]) +]) + +AC_DEFUN([LIBVIRT_DRIVER_CHECK_QEMU], [ + if test "$with_qemu" = "yes" ; then + AC_DEFINE_UNQUOTED([WITH_QEMU], 1, [whether QEMU driver is enabled]) + fi + AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"]) +]) + +AC_DEFUN([LIBVIRT_DRIVER_RESULT_QEMU], [ + LIBVIRT_RESULT([QEMU], [$with_qemu]) +]) -- GitLab