shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-09-01 14:17:33 +03:00
Code Releases Activity

meson: add tls_priority option

Browse Source 
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:
Pavel Hrdina
2020-07-01 03:07:37 +02:00
parent fe98c9f41b
commit 16bdf27dc9
4 changed files with 4 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -85,15 +85,6 @@ dnl
STATIC_BINARIES= STATIC_BINARIES=
AC_SUBST([STATIC_BINARIES]) AC_SUBST([STATIC_BINARIES])
dnl
dnl Miscellaneous checks
dnl
LIBVIRT_ARG_TLS_PRIORITY
LIBVIRT_CHECK_TLS_PRIORITY
dnl Need to test if pkg-config exists dnl Need to test if pkg-config exists
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
@ -153,7 +144,3 @@ AC_MSG_NOTICE([Windows])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
LIBVIRT_WIN_RESULT_WINDRES LIBVIRT_WIN_RESULT_WINDRES
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
AC_MSG_NOTICE([Miscellaneous])
AC_MSG_NOTICE([])
LIBVIRT_RESULT_TLS_PRIORITY
AC_MSG_NOTICE([])

33
m4/virt-tls-priority.m4
View File

@ -1,33 +0,0 @@
dnl The TLS priority check
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_ARG_TLS_PRIORITY], [
LIBVIRT_ARG_WITH([TLS_PRIORITY],
[set the default TLS session priority string],
[NORMAL])
])
AC_DEFUN([LIBVIRT_CHECK_TLS_PRIORITY], [
AC_DEFINE_UNQUOTED([TLS_PRIORITY], ["$with_tls_priority"],
[TLS default priority string])
])
AC_DEFUN([LIBVIRT_RESULT_TLS_PRIORITY], [
LIBVIRT_RESULT([ TLS priority], [$with_tls_priority])
])

3
meson.build
View File

@ -2199,6 +2199,8 @@ elif get_option('sysctl_config').enabled()
error('sysctl configuration is supported only on linux') error('sysctl configuration is supported only on linux')
endif endif
conf.set_quoted('TLS_PRIORITY', get_option('tls_priority'))
# define top include directory # define top include directory
@ -2336,6 +2338,7 @@ misc_summary = {
'Loader/NVRAM': loader_res, 'Loader/NVRAM': loader_res,
'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'),
'virt-host-validate': conf.has('WITH_HOST_VALIDATE'), 'virt-host-validate': conf.has('WITH_HOST_VALIDATE'),
'TLS priority': conf.get_unquoted('TLS_PRIORITY'),
} }
summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ') summary(misc_summary, section: 'Miscellaneous', bool_yn: true, list_sep: ' ')

1
meson_options.txt
View File

@ -101,3 +101,4 @@ option('nss', type: 'feature', value: 'auto', description: 'enable Name Service
option('numad', type: 'feature', value: 'auto', description: 'use numad to manage CPU placement dynamically') option('numad', type: 'feature', value: 'auto', description: 'use numad to manage CPU placement dynamically')
option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management') option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management')
option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs') option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs')
option('tls_priority', type: 'string', value: 'NORMAL', description: 'set the default TLS session priority string')