Signed-off-by: Pavel Hrdina <phrd...@redhat.com> --- configure.ac | 13 ------------- m4/virt-tls-priority.m4 | 33 --------------------------------- meson.build | 3 +++ meson_options.txt | 1 + 4 files changed, 4 insertions(+), 46 deletions(-) delete mode 100644 m4/virt-tls-priority.m4
diff --git a/configure.ac b/configure.ac index 00b547b1a75..5f931071b06 100644 --- a/configure.ac +++ b/configure.ac @@ -85,15 +85,6 @@ dnl 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 PKG_PROG_PKG_CONFIG @@ -153,7 +144,3 @@ AC_MSG_NOTICE([Windows]) AC_MSG_NOTICE([]) LIBVIRT_WIN_RESULT_WINDRES AC_MSG_NOTICE([]) -AC_MSG_NOTICE([Miscellaneous]) -AC_MSG_NOTICE([]) -LIBVIRT_RESULT_TLS_PRIORITY -AC_MSG_NOTICE([]) diff --git a/m4/virt-tls-priority.m4 b/m4/virt-tls-priority.m4 deleted file mode 100644 index 44d9f68f426..00000000000 --- a/m4/virt-tls-priority.m4 +++ /dev/null @@ -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]) -]) diff --git a/meson.build b/meson.build index 7de11d8bf38..9e0cbbad6d7 100644 --- a/meson.build +++ b/meson.build @@ -2179,6 +2179,8 @@ elif get_option('sysctl_config').enabled() error('sysctl configuration is supported only on linux') endif +conf.set_quoted('TLS_PRIORITY', get_option('tls_priority')) + # define top include directory @@ -2312,6 +2314,7 @@ misc_summary = { 'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'), 'virt-login-shell': conf.has('WITH_LOGIN_SHELL'), '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: ' ') diff --git a/meson_options.txt b/meson_options.txt index 9da3455e788..dbbacf7e8ff 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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('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('tls_priority', type: 'string', value: 'NORMAL', description: 'set the default TLS session priority string') -- 2.26.2
