Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 3 --- m4/virt-openwsman.m4 | 30 ------------------------------ meson.build | 4 ++++ meson_options.txt | 1 + 4 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-openwsman.m4 diff --git a/configure.ac b/configure.ac index 2f3730581ef..ce8d3b76657 100644 --- a/configure.ac +++ b/configure.ac @@ -109,7 +109,6 @@ fi # Check for compiler and library settings. LIBVIRT_ARG_NSS -LIBVIRT_ARG_OPENWSMAN LIBVIRT_ARG_PCIACCESS LIBVIRT_ARG_PM_UTILS LIBVIRT_ARG_POLKIT @@ -122,7 +121,6 @@ LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER -LIBVIRT_CHECK_OPENWSMAN LIBVIRT_CHECK_PCIACCESS LIBVIRT_CHECK_PM_UTILS LIBVIRT_CHECK_POLKIT @@ -415,7 +413,6 @@ AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS -LIBVIRT_RESULT_OPENWSMAN LIBVIRT_RESULT_PCIACCESS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_POLKIT diff --git a/m4/virt-openwsman.m4 b/m4/virt-openwsman.m4 deleted file mode 100644 index c952ef89361..00000000000 --- a/m4/virt-openwsman.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libopenwsman.so library -dnl -dnl Copyright (C) 2012-2013 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_ARG_OPENWSMAN],[ - LIBVIRT_ARG_WITH_FEATURE([OPENWSMAN], [openwsman], [check], [2.2.3]) -]) - -AC_DEFUN([LIBVIRT_CHECK_OPENWSMAN],[ - LIBVIRT_CHECK_PKG([OPENWSMAN], [openwsman], [2.2.3]) -]) - -AC_DEFUN([LIBVIRT_RESULT_OPENWSMAN],[ - LIBVIRT_RESULT_LIB([OPENWSMAN]) -]) diff --git a/meson.build b/meson.build index cda54c0e862..0fc7f3f4bb7 100644 --- a/meson.build +++ b/meson.build @@ -1217,6 +1217,9 @@ if numactl_dep.found() endif endif +openwsman_version = '2.2.3' +openwsman_dep = dependency('openwsman', version: '>=' + openwsman_version, required: get_option('openwsman')) + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1371,6 +1374,7 @@ libs_summary = { 'netcf': netcf_dep.found(), 'NLS': have_gnu_gettext_tools, 'numaclt': numactl_dep.found(), + 'openwsman': openwsman_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) diff --git a/meson_options.txt b/meson_options.txt index a29ea23d21a..05d5e44f420 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -31,4 +31,5 @@ option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap d option('netcf', type: 'feature', value: 'auto', description: 'netcf support') option('nls', type: 'feature', value: 'auto', description: 'nls support') option('numactl', type: 'feature', value: 'auto', description: 'numactl support') +option('openwsman', type: 'feature', value: 'auto', description: 'openwsman support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2
