Meson: Cleanup ipcipher module

diff --git a/meson/ipcipher/meson.build b/meson/ipcipher/meson.build
index 54d81399a21711c10f5aaf8f7ca9c5d661e0b71a..0d67db531ac23174e54ac8696654c3f3bbf60af6 100644 (file)
--- 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 5d31f485a2539f53e28a9e69fa17c1c80e5c4f15..270b7cc2bdab4414490bcbdc80b0085313939f24 100644 (file)
--- 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)')