mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-05 08:23:48 +00:00
meson: add GnuTLS build dependency
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
30516e3583
commit
e8aa62c4e4
@ -133,7 +133,6 @@ LIBVIRT_ARG_VIRTUALPORT
|
|||||||
LIBVIRT_ARG_WIRESHARK
|
LIBVIRT_ARG_WIRESHARK
|
||||||
LIBVIRT_ARG_YAJL
|
LIBVIRT_ARG_YAJL
|
||||||
|
|
||||||
LIBVIRT_CHECK_GNUTLS
|
|
||||||
LIBVIRT_CHECK_HAL
|
LIBVIRT_CHECK_HAL
|
||||||
LIBVIRT_CHECK_LIBISCSI
|
LIBVIRT_CHECK_LIBISCSI
|
||||||
LIBVIRT_CHECK_LIBNL
|
LIBVIRT_CHECK_LIBNL
|
||||||
@ -444,7 +443,6 @@ LIBVIRT_RESULT_DRIVER_MODULES
|
|||||||
AC_MSG_NOTICE([])
|
AC_MSG_NOTICE([])
|
||||||
AC_MSG_NOTICE([Libraries])
|
AC_MSG_NOTICE([Libraries])
|
||||||
AC_MSG_NOTICE([])
|
AC_MSG_NOTICE([])
|
||||||
LIBVIRT_RESULT_GNUTLS
|
|
||||||
LIBVIRT_RESULT_HAL
|
LIBVIRT_RESULT_HAL
|
||||||
LIBVIRT_RESULT_LIBISCSI
|
LIBVIRT_RESULT_LIBISCSI
|
||||||
LIBVIRT_RESULT_LIBNL
|
LIBVIRT_RESULT_LIBNL
|
||||||
|
@ -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])
|
|
||||||
])
|
|
@ -1066,6 +1066,9 @@ glib_dep = declare_dependency(
|
|||||||
glusterfs_version = '3.4.1'
|
glusterfs_version = '3.4.1'
|
||||||
glusterfs_dep = dependency('glusterfs-api', version: '>=' + glusterfs_version, required: get_option('glusterfs'))
|
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 7.0 is the first version which includes pkg-config support
|
||||||
readline_version = '7.0'
|
readline_version = '7.0'
|
||||||
readline_dep = dependency('readline', version: '>=' + readline_version, required: false)
|
readline_dep = dependency('readline', version: '>=' + readline_version, required: false)
|
||||||
@ -1204,6 +1207,7 @@ libs_summary = {
|
|||||||
'fuse': fuse_dep.found(),
|
'fuse': fuse_dep.found(),
|
||||||
'glib_dep': glib_dep.found(),
|
'glib_dep': glib_dep.found(),
|
||||||
'glusterfs': glusterfs_dep.found(),
|
'glusterfs': glusterfs_dep.found(),
|
||||||
|
'gnutls': gnutls_dep.found(),
|
||||||
'readline': readline_dep.found(),
|
'readline': readline_dep.found(),
|
||||||
}
|
}
|
||||||
summary(libs_summary, section: 'Libraries', bool_yn: true)
|
summary(libs_summary, section: 'Libraries', bool_yn: true)
|
||||||
|
Loading…
Reference in New Issue
Block a user