mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 05:35:25 +00:00
meson: add host_validate build option
Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
parent
3c0add43b8
commit
efbbd59bcb
@ -101,7 +101,6 @@ LIBVIRT_ARG_NUMAD
|
||||
LIBVIRT_ARG_INIT_SCRIPT
|
||||
LIBVIRT_ARG_LOADER_NVRAM
|
||||
LIBVIRT_ARG_LOGIN_SHELL
|
||||
LIBVIRT_ARG_HOST_VALIDATE
|
||||
LIBVIRT_ARG_TLS_PRIORITY
|
||||
LIBVIRT_ARG_SYSCTL_CONFIG
|
||||
|
||||
@ -110,7 +109,6 @@ LIBVIRT_CHECK_NUMAD
|
||||
LIBVIRT_CHECK_INIT_SCRIPT
|
||||
LIBVIRT_CHECK_LOADER_NVRAM
|
||||
LIBVIRT_CHECK_LOGIN_SHELL
|
||||
LIBVIRT_CHECK_HOST_VALIDATE
|
||||
LIBVIRT_CHECK_TLS_PRIORITY
|
||||
LIBVIRT_CHECK_SYSCTL_CONFIG
|
||||
LIBVIRT_CHECK_NSS
|
||||
@ -185,6 +183,5 @@ LIBVIRT_RESULT_NUMAD
|
||||
LIBVIRT_RESULT_INIT_SCRIPT
|
||||
LIBVIRT_RESULT_LOADER_NVRAM
|
||||
LIBVIRT_RESULT_LOGIN_SHELL
|
||||
LIBVIRT_RESULT_HOST_VALIDATE
|
||||
LIBVIRT_RESULT_TLS_PRIORITY
|
||||
AC_MSG_NOTICE([])
|
||||
|
@ -1,43 +0,0 @@
|
||||
dnl Copyright (C) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
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/>.
|
||||
|
||||
AC_DEFUN([LIBVIRT_ARG_HOST_VALIDATE], [
|
||||
LIBVIRT_ARG_WITH([HOST_VALIDATE], [build virt-host-validate], [check])
|
||||
])
|
||||
|
||||
AC_DEFUN([LIBVIRT_CHECK_HOST_VALIDATE], [
|
||||
if test "x$with_host_validate" != "xno"; then
|
||||
if test "x$with_win" = "xyes"; then
|
||||
if test "x$with_host_validate" = "xyes"; then
|
||||
AC_MSG_ERROR([virt-host-validate is not supported on Windows])
|
||||
else
|
||||
with_host_validate=no;
|
||||
fi
|
||||
else
|
||||
with_host_validate=yes;
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$with_host_validate" = "xyes" ; then
|
||||
AC_DEFINE_UNQUOTED([WITH_HOST_VALIDATE], 1, [whether virt-host-validate is built])
|
||||
fi
|
||||
AM_CONDITIONAL([WITH_HOST_VALIDATE], [test "x$with_host_validate" = "xyes"])
|
||||
])
|
||||
|
||||
AC_DEFUN([LIBVIRT_RESULT_HOST_VALIDATE], [
|
||||
LIBVIRT_RESULT([virt-host-validate], [$with_host_validate])
|
||||
])
|
@ -2092,6 +2092,12 @@ if host_machine.system() == 'linux'
|
||||
endif
|
||||
endif
|
||||
|
||||
if not get_option('host_validate').disabled() and host_machine.system() != 'windows'
|
||||
conf.set('WITH_HOST_VALIDATE', 1)
|
||||
elif get_option('host_validate').enabled()
|
||||
error('virt-host-validate is not supported on Windows')
|
||||
endif
|
||||
|
||||
|
||||
# define top include directory
|
||||
|
||||
@ -2217,6 +2223,7 @@ misc_summary = {
|
||||
'Warning Flags': supported_cc_flags,
|
||||
'DTrace': conf.has('WITH_DTRACE_PROBES'),
|
||||
'Char device locks': chrdev_lock_files,
|
||||
'virt-host-validate': conf.has('WITH_HOST_VALIDATE'),
|
||||
}
|
||||
summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ')
|
||||
|
||||
|
@ -93,3 +93,4 @@ option('storage_zfs', type: 'feature', value: 'auto', description: 'ZFS backend
|
||||
# build feature options
|
||||
option('chrdev_lock_files', type: 'string', value: '', description: 'location for UUCP style lock files for character devices (leave empty for default paths on some platforms)')
|
||||
option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace for static probing')
|
||||
option('host_validate', type: 'feature', value: 'auto', description: 'build virt-host-validate')
|
||||
|
Loading…
Reference in New Issue
Block a user