Meson: Use enabled/disabled in libcrypto instead of yes/no

diff --git a/meson/libcrypto/meson.build b/meson/libcrypto/meson.build
index fecafaa9a7e61faed3438c1bf32bcde3a60efdd0..c88b3ad544fb791eb2007cdcab3cf574b3ea84ae 100644 (file)
--- a/meson/libcrypto/meson.build
+++ b/meson/libcrypto/meson.build
@@ -8,17 +8,18 @@ dep_libcrypto = dependency('', required: false)
 ssldirs = []
 have_libcrypto = false
 if opt_libcrypto == ''
-  error('Invalid value for libcrypto option, either use auto, yes, no, ' +
-        'or pass a directory where the library can be found')
+  error('Invalid value for libcrypto option, either use auto, enabled, disabled, ' +
+        'or pass a directory where the library can be found. ' +
+        'See `meson configure` for more info.')
 endif
 
-if opt_libcrypto == 'no'
+if opt_libcrypto == 'disabled'
   subdir_done()
 endif
 
 # Generally, try to find libcrypto using the mechanisms provided by meson
 # (e.g. pkg-config). If an explicit directory for libcrypto was passed, use that instead.
-if opt_libcrypto == 'auto' or opt_libcrypto == 'yes'
+if opt_libcrypto == 'auto' or opt_libcrypto == 'enabled'
   dep_libcrypto = dependency('libcrypto', required: false)
   have_libcrypto = dep_libcrypto.found()
 else

diff --git a/meson_options.txt b/meson_options.txt
index c0517ea350ab3b8dedd3f33b024984cfb050fe38..fdad646c9cb7166bcd3a1d0eb4615a2534c4a2b5 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,7 +4,7 @@ option('fortify-source', type: 'combo', choices: ['auto', 'disabled', '1', '2',
 option('kiss-rng', type: 'boolean', value: false, description: 'Use the unsafe KISS RNG')
 option('libsodium', type: 'feature', value: 'auto', description: 'Build support for libsodium-based signers')
 option('libdecaf', type: 'feature', value: 'auto', description: 'Build support for libdecaf-based signers')
-option('libcrypto', type: 'string', value: 'auto', description: 'Build support for libcrypto-based signers (auto, yes, no, or a path)')
+option('libcrypto', type: 'string', value: 'auto', description: 'Build support for libcrypto-based signers (auto, enabled, disabled, or a path)')
 option('libssl', type: 'feature', value: 'auto', description: 'Build support for libssl')
 option('gnutls', type: 'feature', value: 'auto', description: 'Build support for GnuTLS')
 option('dns-over-tls', type: 'boolean', value: false, description: 'Enable DNS over TLS (requires GnuTLS or OpenSSL)')