From aaac076c002af8c706f126bfab9c7c388273722d Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Wed, 16 Aug 2023 14:14:10 +0200 Subject: [PATCH] Meson: Cleanup ipcipher module --- meson/ipcipher/meson.build | 12 ++++-------- meson_options.txt | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/meson/ipcipher/meson.build b/meson/ipcipher/meson.build index 54d81399a2..0d67db531a 100644 --- a/meson/ipcipher/meson.build +++ b/meson/ipcipher/meson.build @@ -1,13 +1,9 @@ -# IPCipher -# Inputs: conf have_libcrypto - opt_ipcipher = get_option('ipcipher') -if not have_libcrypto and opt_ipcipher.enabled() +if not dep_libcrypto.found() and opt_ipcipher.enabled() error('ipcipher support was requested but libcrypto is not available') endif -enable_ipcipher = have_libcrypto and not opt_ipcipher.disabled() -conf.set10('HAVE_IPCIPHER', enable_ipcipher, description: 'Whether ipcipher support is enabled') -show_colors = have_libcrypto or not opt_ipcipher.auto() -summary('ipcipher', enable_ipcipher, bool_yn: show_colors, section: 'Configuration') +enable_ipcipher = dep_libcrypto.found() and not opt_ipcipher.disabled() +conf.set('HAVE_IPCIPHER', enable_ipcipher, description: 'ipcipher support') +summary('ipcipher', enable_ipcipher, bool_yn: true, section: 'Configuration') diff --git a/meson_options.txt b/meson_options.txt index 5d31f485a2..270b7cc2bd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -8,8 +8,8 @@ option('signers-libcrypto', type: 'feature', value: 'auto', description: 'Enable option('signers-libcrypto-path', type: 'string', value: '', description: 'Custom path to find OpenSSL libcrypto') option('tls-gnutls', type: 'feature', value: 'auto', description: 'Enable GnuTLS-based TLS') option('dns-over-tls', type: 'boolean', value: false, description: 'Enable DNS over TLS (requires GnuTLS or OpenSSL)') -option('ipcipher', type: 'feature', value: 'auto', description: 'Enable ipcipher (requires libcrypto)') option('tls-libssl', type: 'feature', value: 'auto', description: 'OpenSSL-based TLS') +option('ipcipher', type: 'feature', value: 'auto', description: 'IPcipher (requires libcrypto)') option('unit-tests', type: 'boolean', value: false, description: 'Build and run unit tests') option('unit-tests-backends', type: 'boolean', value: false, description: 'Build and run backend unit tests') option('reproducible', type: 'boolean', value: false, description: 'Create reproducible builds (for distribution maintainers, makes debugging more difficult)') -- 2.47.2