meson: add Hyper-V driver build option

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 50f7d12e6067fe4aa0469f961baf6acd09c4423e..38aa9d5eee35642703c2507f38d262c68c6fc797 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -116,7 +116,6 @@ LIBVIRT_DRIVER_ARG_LIBXL
 LIBVIRT_DRIVER_ARG_VBOX
 LIBVIRT_DRIVER_ARG_LXC
 LIBVIRT_DRIVER_ARG_VZ
-LIBVIRT_DRIVER_ARG_HYPERV
 LIBVIRT_DRIVER_ARG_TEST
 LIBVIRT_DRIVER_ARG_NETWORK
 LIBVIRT_DRIVER_ARG_INTERFACE
@@ -128,7 +127,6 @@ LIBVIRT_DRIVER_CHECK_LIBXL
 LIBVIRT_DRIVER_CHECK_VBOX
 LIBVIRT_DRIVER_CHECK_LXC
 LIBVIRT_DRIVER_CHECK_VZ
-LIBVIRT_DRIVER_CHECK_HYPERV
 LIBVIRT_DRIVER_CHECK_TEST
 LIBVIRT_DRIVER_CHECK_NETWORK
 LIBVIRT_DRIVER_CHECK_INTERFACE
@@ -329,7 +327,6 @@ LIBVIRT_DRIVER_RESULT_VMWARE
 LIBVIRT_DRIVER_RESULT_VBOX
 LIBVIRT_DRIVER_RESULT_LIBXL
 LIBVIRT_DRIVER_RESULT_LXC
-LIBVIRT_DRIVER_RESULT_HYPERV
 LIBVIRT_DRIVER_RESULT_VZ
 LIBVIRT_DRIVER_RESULT_TEST
 LIBVIRT_DRIVER_RESULT_NETWORK

diff --git a/m4/virt-driver-hyperv.m4 b/m4/virt-driver-hyperv.m4
deleted file mode 100644 (file)
index f276a88..0000000
--- a/m4/virt-driver-hyperv.m4
+++ /dev/null
@@ -1,47 +0,0 @@
-dnl The Hyper-V 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_HYPERV], [
-  LIBVIRT_ARG_WITH_FEATURE([HYPERV], [Hyper-V], [check])
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_CHECK_HYPERV], [
-  AC_REQUIRE([LIBVIRT_CHECK_OPENWSMAN])
-
-  if test "$with_hyperv" != "no"; then
-    if test "$with_openwsman" != "yes"; then
-      if test "$with_hyperv" = "check"; then
-        with_hyperv=no
-      else
-        AC_MSG_ERROR([openwsman is required for the Hyper-V driver])
-      fi
-    else
-      with_hyperv=yes
-    fi
-  fi
-
-  if test "$with_hyperv" = "yes" ; then
-    AC_DEFINE_UNQUOTED([WITH_HYPERV], 1, [whether Hyper-V driver is enabled])
-  fi
-  AM_CONDITIONAL([WITH_HYPERV], [test "$with_hyperv" = "yes"])
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_RESULT_HYPERV], [
-  LIBVIRT_RESULT([Hyper-V], [$with_hyperv])
-])

diff --git a/meson.build b/meson.build
index d0a719600a002ea4634e5952df7a8032cf9f0547..a246a4196ed71f537883ab825bfef929c38c6369 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1611,6 +1611,12 @@ elif get_option('driver_esx').enabled()
   error('Curl is required for the ESX driver')
 endif
 
+if not get_option('driver_hyperv').disabled() and openwsman_dep.found()
+  conf.set('WITH_HYPERV', 1)
+elif get_option('driver_hyperv').enabled()
+  error('openwsman is required for the Hyper-V driver')
+endif
+
 
 # define top include directory
 
@@ -1632,6 +1638,7 @@ configure_file(output: 'meson-config.h', configuration: conf)
 
 driver_summary = {
   'ESX': conf.has('WITH_ESX'),
+  'Hyper-V': conf.has('WITH_HYPERV'),
   'Bhyve': conf.has('WITH_BHYVE'),
   'Remote': conf.has('WITH_REMOTE'),
   'Libvirtd': conf.has('WITH_LIBVIRTD'),

diff --git a/meson_options.txt b/meson_options.txt
index a59949b9792bc226b106adcdb83cd634d74d640a..75679e1d0f62d145184952dc06a0db0b13ef5c10 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -50,6 +50,7 @@ option('yajl', type: 'feature', value: 'auto', description: 'yajl support')
 # build driver options
 option('driver_bhyve', type: 'feature', value: 'auto', description: 'bhyve driver')
 option('driver_esx', type: 'feature', value: 'enabled', description: 'esx driver')
+option('driver_hyperv', type: 'feature', value: 'auto', description: 'Hyper-V driver')
 option('driver_libvirtd', type: 'feature', value: 'auto', description: 'libvirtd driver')
 option('driver_remote', type: 'feature', value: 'enabled', description: 'remote driver')
 option('remote_default_mode', type: 'combo', choices: ['legacy', 'direct'], value: 'legacy', description: 'remote driver default mode')