External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 01:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: move ESX driver check to its own file

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-12-01 10:40:31 +01:00
parent 572e79df7e
commit ceb2e03912
2 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
configure.ac
View File

@ -407,7 +407,7 @@ LIBVIRT_DRIVER_ARG_XENAPI
LIBVIRT_DRIVER_ARG_LIBXL LIBVIRT_DRIVER_ARG_LIBXL
LIBVIRT_DRIVER_ARG_VBOX LIBVIRT_DRIVER_ARG_VBOX
LIBVIRT_DRIVER_ARG_LXC LIBVIRT_DRIVER_ARG_LXC
LIBVIRT_ARG_WITH([ESX], [ESX], [check]) LIBVIRT_DRIVER_ARG_ESX
LIBVIRT_ARG_WITH([HYPERV], [Hyper-V], [check]) LIBVIRT_ARG_WITH([HYPERV], [Hyper-V], [check])
LIBVIRT_DRIVER_ARG_TEST LIBVIRT_DRIVER_ARG_TEST
LIBVIRT_DRIVER_ARG_REMOTE LIBVIRT_DRIVER_ARG_REMOTE
@ -973,32 +973,7 @@ dnl
dnl check for (ESX) dnl check for (ESX)
dnl dnl
if test "$with_curl" != "yes" ; then LIBVIRT_DRIVER_CHECK_ESX
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"])
dnl dnl
dnl check for Hyper-V dnl check for Hyper-V
@ -1343,7 +1318,7 @@ LIBVIRT_DRIVER_RESULT_XENAPI
LIBVIRT_DRIVER_RESULT_LIBXL LIBVIRT_DRIVER_RESULT_LIBXL
LIBVIRT_DRIVER_RESULT_LXC LIBVIRT_DRIVER_RESULT_LXC
LIBVIRT_DRIVER_RESULT_PHYP LIBVIRT_DRIVER_RESULT_PHYP
AC_MSG_NOTICE([ ESX: $with_esx]) LIBVIRT_DRIVER_RESULT_ESX
AC_MSG_NOTICE([ Hyper-V: $with_hyperv]) AC_MSG_NOTICE([ Hyper-V: $with_hyperv])
LIBVIRT_DRIVER_RESULT_VZ LIBVIRT_DRIVER_RESULT_VZ
LIBVIRT_DRIVER_RESULT_BHYVE LIBVIRT_DRIVER_RESULT_BHYVE

57
m4/virt-driver-esx.m4 Normal file
View File

@ -0,0 +1,57 @@
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([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])
])