[libvirt] [PATCH 52/89] configure: move OpenVZ driver check to its own file

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 22 +++------------------- m4/virt-driver-openvz.m4 | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 19 deletions(-) create mode 100644 m4/virt-driver-openvz.m4 diff --git a/configure.ac b/configure.ac index 9173f91517..5879444da0 100644 --- a/configure.ac +++ b/configure.ac @@ -401,7 +401,7 @@ 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_ARG_WITH([OPENVZ], [OpenVZ], [check]) +LIBVIRT_DRIVER_ARG_OPENVZ LIBVIRT_ARG_WITH([VMWARE], [VMware], [yes]) LIBVIRT_ARG_WITH([PHYP], [PHYP], [check]) LIBVIRT_ARG_WITH([XENAPI], [XenAPI], [check]) @@ -453,23 +453,7 @@ LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG -dnl -dnl Checks for the OpenVZ driver -dnl - -if test "$with_openvz" = "check"; then - with_openvz=$with_linux -fi - -if test "$with_openvz" = "yes" && test "$with_linux" = "no"; then - AC_MSG_ERROR([The OpenVZ driver can be enabled on Linux only.]) -fi - -if test "$with_openvz" = "yes"; then - AC_DEFINE_UNQUOTED([WITH_OPENVZ], 1, [whether OpenVZ driver is enabled]) -fi -AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" = "yes"]) - +LIBVIRT_DRIVER_CHECK_OPENVZ dnl dnl Checks for the VMware Workstation/Player driver @@ -1692,7 +1676,7 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([ Xen: $with_xen]) AC_MSG_NOTICE([ QEMU: $with_qemu]) LIBVIRT_DRIVER_RESULT_UML -AC_MSG_NOTICE([ OpenVZ: $with_openvz]) +LIBVIRT_DRIVER_RESULT_OPENVZ AC_MSG_NOTICE([ VMware: $with_vmware]) AC_MSG_NOTICE([ VBox: $with_vbox]) AC_MSG_NOTICE([ XenAPI: $with_xenapi]) diff --git a/m4/virt-driver-openvz.m4 b/m4/virt-driver-openvz.m4 new file mode 100644 index 0000000000..bd00f69679 --- /dev/null +++ b/m4/virt-driver-openvz.m4 @@ -0,0 +1,42 @@ +dnl The OpenVZ 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 <http://www.gnu.org/licenses/>;. +dnl + +AC_DEFUN([LIBVIRT_DRIVER_ARG_OPENVZ], [ + LIBVIRT_ARG_WITH([OPENVZ], [OpenVZ], [check]) +]) + +AC_DEFUN([LIBVIRT_DRIVER_CHECK_OPENVZ], [ + if test "$with_openvz" = "check"; then + with_openvz=$with_linux + fi + + if test "$with_openvz" = "yes" && test "$with_linux" = "no"; then + AC_MSG_ERROR([The OpenVZ driver can be enabled on Linux only.]) + fi + + if test "$with_openvz" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_OPENVZ], 1, [whether OpenVZ driver is enabled]) + fi + + AM_CONDITIONAL([WITH_OPENVZ], [test "$with_openvz" = "yes"]) +]) + +AC_DEFUN([LIBVIRT_DRIVER_RESULT_OPENVZ], [ + LIBVIRT_RESULT([OpenVZ], [$with_openvz]) +]) -- 2.11.0