meson: add tls_priority option

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 1bfd38b9d59b9eb8ac91acb09a8692aa601a2c85..d5f84f075f926a5ebcba8bbf06863e26aea117e1 100644 (file)
--- 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 (file)
index 44d9f68..0000000
--- 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 3f398733bbedf6d295a9369a3fbbf9211b11a05e..f4b0d25373aacdb2b12c96da042dfea6d548b0a6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2199,6 +2199,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
 
@@ -2336,6 +2338,7 @@ misc_summary = {
   'Loader/NVRAM': loader_res,
   '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 eab361251c829666e63cf732901a1384646ec7ba..d27a4755b12d0e9c5127622709c524991f7b4e75 100644 (file)
--- 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')