meson: add ESX 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 5e7b7d97fa10ab2f4aa423aa36ef6bbd635b631d..50f7d12e6067fe4aa0469f961baf6acd09c4423e 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_ESX
 LIBVIRT_DRIVER_ARG_HYPERV
 LIBVIRT_DRIVER_ARG_TEST
 LIBVIRT_DRIVER_ARG_NETWORK
@@ -129,7 +128,6 @@ LIBVIRT_DRIVER_CHECK_LIBXL
 LIBVIRT_DRIVER_CHECK_VBOX
 LIBVIRT_DRIVER_CHECK_LXC
 LIBVIRT_DRIVER_CHECK_VZ
-LIBVIRT_DRIVER_CHECK_ESX
 LIBVIRT_DRIVER_CHECK_HYPERV
 LIBVIRT_DRIVER_CHECK_TEST
 LIBVIRT_DRIVER_CHECK_NETWORK
@@ -331,7 +329,6 @@ LIBVIRT_DRIVER_RESULT_VMWARE
 LIBVIRT_DRIVER_RESULT_VBOX
 LIBVIRT_DRIVER_RESULT_LIBXL
 LIBVIRT_DRIVER_RESULT_LXC
-LIBVIRT_DRIVER_RESULT_ESX
 LIBVIRT_DRIVER_RESULT_HYPERV
 LIBVIRT_DRIVER_RESULT_VZ
 LIBVIRT_DRIVER_RESULT_TEST

diff --git a/m4/virt-driver-esx.m4 b/m4/virt-driver-esx.m4
deleted file mode 100644 (file)
index 4a2944b..0000000
--- a/m4/virt-driver-esx.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-dnl The ESX 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_ESX], [
-  LIBVIRT_ARG_WITH_FEATURE([ESX], [ESX], [check])
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_CHECK_ESX], [
-  AC_REQUIRE([LIBVIRT_CHECK_CURL])
-  AC_REQUIRE([LIBVIRT_DRIVER_CHECK_VMWARE])
-
-  if test "$with_curl" != "yes" ; then
-    if test "$with_esx" != "yes"; then
-      with_esx=no
-    else
-      AC_MSG_ERROR([Curl is required for the ESX driver])
-    fi
-  else
-    if test "$with_esx" = "check"; then
-      with_esx=yes
-    fi
-  fi
-
-  if test "$with_esx" = "yes" ; then
-    AC_DEFINE_UNQUOTED([WITH_ESX], 1, [whether ESX driver is enabled])
-  fi
-  AM_CONDITIONAL([WITH_ESX], [test "$with_esx" = "yes"])
-
-  with_vmx=yes
-  if test "$with_esx" != "yes" && test "$with_vmware" != "yes"; then
-    with_vmx=no
-  fi
-  if test "$with_vmx" = "yes" ; then
-    AC_DEFINE_UNQUOTED([WITH_VMX], 1, [whether VMware VMX config handling is enabled])
-  fi
-  AM_CONDITIONAL([WITH_VMX], [test "$with_vmx" = "yes"])
-])
-
-AC_DEFUN([LIBVIRT_DRIVER_RESULT_ESX], [
-  LIBVIRT_RESULT([ESX], [$with_esx])
-])

diff --git a/meson.build b/meson.build
index cee6f4873ba3b49460396ee62a3062f0da0aa4fe..d0a719600a002ea4634e5952df7a8032cf9f0547 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1604,6 +1604,13 @@ elif get_option('driver_bhyve').enabled()
   error('The bhyve driver cannot be enabled')
 endif
 
+if not get_option('driver_esx').disabled() and curl_dep.found()
+  conf.set('WITH_ESX', 1)
+  conf.set('WITH_VMX', 1)
+elif get_option('driver_esx').enabled()
+  error('Curl is required for the ESX driver')
+endif
+
 
 # define top include directory
 
@@ -1624,6 +1631,7 @@ configure_file(output: 'meson-config.h', configuration: conf)
 # print configuration summary
 
 driver_summary = {
+  'ESX': conf.has('WITH_ESX'),
   '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 d933a40b0f4139d24b00f25e6412b25a77818625..a59949b9792bc226b106adcdb83cd634d74d640a 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -49,6 +49,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_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')