From a3b76f0ceb4d609f5feb4b2833d8c9ebd03c7868 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 7 Mar 2025 09:10:23 +0100 Subject: [PATCH] [#3731] Simplified crypto option --- meson.build | 8 +------- meson.options | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 8b859999dc..b441973978 100644 --- a/meson.build +++ b/meson.build @@ -337,13 +337,7 @@ if SHELL_OPT == 'enabled' and not PYTHON.found() error('kea-shell requires python. Python not found.') endif -if crypto_opt == 'auto' - if openssl.found() - crypto = openssl - elif botan.found() - crypto = botan - endif -elif crypto_opt == 'botan' +if crypto_opt == 'botan' if botan.found() crypto = botan endif diff --git a/meson.options b/meson.options index 3e76be4942..a87e836c6c 100644 --- a/meson.options +++ b/meson.options @@ -7,7 +7,7 @@ option( ) # Dependency-related options -option('crypto', type: 'combo', choices: ['auto', 'botan', 'openssl'], value: 'auto', description: 'Backend for cryptographical operations. Mandatory.') +option('crypto', type: 'combo', choices: ['botan', 'openssl'], value: 'openssl', description: 'Backend for cryptographical operations. Mandatory.') option('krb5', type: 'combo', choices: ['', 'auto', 'enabled', 'disabled'], value: '', description: 'Support for GSS-TSIG. Requires krb5 with gssapi.') option('gtest', type: 'combo', choices: ['', 'auto', 'enabled', 'disabled'], value: '', description: 'Support for unit tests with GTest.') option('mysql', type: 'combo', choices: ['', 'auto', 'enabled', 'disabled'], value: '', description: 'Support for MySQL backends.')