[libvirt PATCH 050/351] meson: add GnuTLS build dependency

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 2 -- m4/virt-gnutls.m4 | 30 ------------------------------ meson.build | 4 ++++ 3 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 m4/virt-gnutls.m4 diff --git a/configure.ac b/configure.ac index fa9fecccc73..de31d11e63b 100644 --- a/configure.ac +++ b/configure.ac @@ -133,7 +133,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_GNUTLS LIBVIRT_CHECK_HAL LIBVIRT_CHECK_LIBISCSI LIBVIRT_CHECK_LIBNL @@ -446,7 +445,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_GNUTLS LIBVIRT_RESULT_HAL LIBVIRT_RESULT_LIBISCSI LIBVIRT_RESULT_LIBNL diff --git a/m4/virt-gnutls.m4 b/m4/virt-gnutls.m4 deleted file mode 100644 index 6829ca55cf5..00000000000 --- a/m4/virt-gnutls.m4 +++ /dev/null @@ -1,30 +0,0 @@ -dnl The gnutls libgnutls.so library -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_CHECK_GNUTLS],[ - LIBVIRT_CHECK_PKG([GNUTLS], [gnutls], [3.2.0]) - - dnl Require gnutls >= 3.2.0 because of 3.2.11 in Ubuntu 14.04 - dnl That should have all the functions we use (in >= 2.12) - dnl and also use nettle, because it's >= 3.0 -]) - -AC_DEFUN([LIBVIRT_RESULT_GNUTLS],[ - LIBVIRT_RESULT_LIB([GNUTLS]) -]) diff --git a/meson.build b/meson.build index 4ee7031b32c..5a9e9f26db1 100644 --- a/meson.build +++ b/meson.build @@ -1050,6 +1050,9 @@ glib_dep = declare_dependency( glusterfs_version = '3.4.1' glusterfs_dep = dependency('glusterfs-api', version: '>=' + glusterfs_version, required: get_option('glusterfs')) +gnutls_version = '3.2.0' +gnutls_dep = dependency('gnutls', version: '>=' + gnutls_version) + # 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) @@ -1188,6 +1191,7 @@ libs_summary = { 'fuse': fuse_dep.found(), 'glib_dep': glib_dep.found(), 'glusterfs': glusterfs_dep.found(), + 'gnutls': gnutls_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) -- 2.26.2