Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 3 --- m4/virt-netcf.m4 | 30 ------------------------------ meson.build | 7 +++++++ meson_options.txt | 1 + 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100644 m4/virt-netcf.m4 diff --git a/configure.ac b/configure.ac index 6710900fa35..798a30bbd3d 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,6 @@ fi # Check for compiler and library settings. -LIBVIRT_ARG_NETCF LIBVIRT_ARG_NLS LIBVIRT_ARG_NSS LIBVIRT_ARG_NUMACTL @@ -124,7 +123,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_NETCF LIBVIRT_CHECK_NLS LIBVIRT_CHECK_NUMACTL LIBVIRT_CHECK_NWFILTER @@ -421,7 +419,6 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) LIBVIRT_RESULT_LIBXL -LIBVIRT_RESULT_NETCF LIBVIRT_RESULT_NLS LIBVIRT_RESULT_NSS LIBVIRT_RESULT_NUMACTL diff --git a/m4/virt-netcf.m4 b/m4/virt-netcf.m4 deleted file mode 100644 index ada6b5a7a98..00000000000 --- a/m4/virt-netcf.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The libnetcf.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_NETCF],[ - LIBVIRT_ARG_WITH_FEATURE([NETCF], [netcf], [check], [0.1.8]) -]) - -AC_DEFUN([LIBVIRT_CHECK_NETCF],[ - LIBVIRT_CHECK_PKG([NETCF], [netcf], [0.1.8]) -]) - -AC_DEFUN([LIBVIRT_RESULT_NETCF],[ - LIBVIRT_RESULT_LIB([NETCF]) -]) diff --git a/meson.build b/meson.build index 55cf12a951c..025878a0df6 100644 --- a/meson.build +++ b/meson.build @@ -1164,6 +1164,12 @@ if use_macvtap endif endif +netcf_version = '0.1.8' +netcf_dep = dependency('netcf', version: '>=' + netcf_version, required: get_option('netcf')) +if netcf_dep.found() + conf.set('WITH_NETCF', 1) +endif + # 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) @@ -1315,6 +1321,7 @@ libs_summary = { 'libssh2': libssh2_dep.found(), 'libxml': libxml_dep.found(), 'macvtap': conf.has('WITH_MACVTAP'), + 'netcf': netcf_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 a6e53ca36dc..dc248ee0fe4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -28,4 +28,5 @@ option('libpcap', type: 'feature', value: 'auto', description: 'libpcap support' option('libssh', type: 'feature', value: 'auto', description: 'libssh support') option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support') option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device') +option('netcf', type: 'feature', value: 'auto', description: 'netcf support') option('readline', type: 'feature', value: 'auto', description: 'readline support') -- 2.26.2
