Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 3 --- m4/virt-host-validate.m4 | 43 ---------------------------------------- meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-host-validate.m4 diff --git a/configure.ac b/configure.ac index 2f486df2e23..eaa7b57380e 100644 --- a/configure.ac +++ b/configure.ac @@ -100,7 +100,6 @@ dnl LIBVIRT_ARG_NUMAD LIBVIRT_ARG_INIT_SCRIPT LIBVIRT_ARG_LOGIN_SHELL -LIBVIRT_ARG_HOST_VALIDATE LIBVIRT_ARG_TLS_PRIORITY LIBVIRT_ARG_SYSCTL_CONFIG @@ -108,7 +107,6 @@ LIBVIRT_ARG_SYSCTL_CONFIG LIBVIRT_CHECK_NUMAD LIBVIRT_CHECK_INIT_SCRIPT LIBVIRT_CHECK_LOGIN_SHELL -LIBVIRT_CHECK_HOST_VALIDATE LIBVIRT_CHECK_TLS_PRIORITY LIBVIRT_CHECK_SYSCTL_CONFIG LIBVIRT_CHECK_NSS @@ -182,6 +180,5 @@ AC_MSG_NOTICE([]) LIBVIRT_RESULT_NUMAD LIBVIRT_RESULT_INIT_SCRIPT LIBVIRT_RESULT_LOGIN_SHELL -LIBVIRT_RESULT_HOST_VALIDATE LIBVIRT_RESULT_TLS_PRIORITY AC_MSG_NOTICE([]) diff --git a/m4/virt-host-validate.m4 b/m4/virt-host-validate.m4 deleted file mode 100644 index e43cec53665..00000000000 --- a/m4/virt-host-validate.m4 +++ /dev/null @@ -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]) -]) diff --git a/meson.build b/meson.build index c7c5cdd3b40..ece7c90e26d 100644 --- a/meson.build +++ b/meson.build @@ -2080,6 +2080,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 @@ -2207,6 +2213,7 @@ misc_summary = { 'DTrace': conf.has('WITH_DTRACE_PROBES'), 'Char device locks': chrdev_lock_files, 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), + 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), } summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ') diff --git a/meson_options.txt b/meson_options.txt index b12d0aa3d7b..80a11df4679 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -94,3 +94,4 @@ option('chrdev_lock_files', type: 'string', value: '', description: 'location fo option('debug_logs', type: 'boolean', value: true, description: 'enable debugging output') option('default_editor', type: 'string', value: 'vi', description: 'Editor to use for interactive commands') option('dtrace', type: 'feature', value: 'auto', description: 'use dtrace for static probing') +option('host_validate', type: 'feature', value: 'auto', description: 'build virt-host-validate') -- 2.26.2
