From: Fred Morcos Date: Mon, 7 Aug 2023 11:32:55 +0000 (+0200) Subject: Meson: More consistent option naming X-Git-Tag: rec-5.1.0-alpha1~80^2~297 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e76734b1b6352c3caf49a218f0e83e8911e180d;p=thirdparty%2Fpdns.git Meson: More consistent option naming --- diff --git a/meson.build b/meson.build index 3624957873..4b6c5c0b67 100644 --- a/meson.build +++ b/meson.build @@ -77,7 +77,7 @@ endif # TODO Generate pdns/dnslabeltext.cc # Backend Unit Tests -opt_backend_unittests = get_option('backend-unit-tests') +opt_backend_unittests = get_option('unit-tests-backends') dep_boost_test = dependency('boost', modules: ['unit_test_framework'], required: opt_backend_unittests) deps += dep_boost_test conf.set10('BACKEND_UNIT_TESTS', opt_backend_unittests, description: 'Whether backend unit tests are enabled') diff --git a/meson/gnutls/meson.build b/meson/gnutls/meson.build index fce3197bc6..467b87d6dc 100644 --- a/meson/gnutls/meson.build +++ b/meson/gnutls/meson.build @@ -1,7 +1,7 @@ # GnuTLS # Inputs: conf deps -opt_gnutls = get_option('gnutls') +opt_gnutls = get_option('tls-gnutls') dep_gnutls = dependency('gnutls', version: '>= 3.1.11', required: opt_gnutls) if dep_gnutls.found() diff --git a/meson/ixfrdist/meson.build b/meson/ixfrdist/meson.build index 41dab753fd..315a47a71f 100644 --- a/meson/ixfrdist/meson.build +++ b/meson/ixfrdist/meson.build @@ -1,7 +1,7 @@ # Ixfrdist # Inputs: deps conf -opt_ixfrdist = get_option('ixfrdist') +opt_ixfrdist = get_option('tools-ixfrdist') deps += dependency('yaml-cpp', version: '>= 0.5', required: opt_ixfrdist) conf.set10('IXFRDIST', opt_ixfrdist, description: 'Whether to build ixfrdist') summary('Build `ixfrdist`', opt_ixfrdist, section: 'Configuration') diff --git a/meson/kiss-rng/meson.build b/meson/kiss-rng/meson.build index 93ea10461d..86e65c467b 100644 --- a/meson/kiss-rng/meson.build +++ b/meson/kiss-rng/meson.build @@ -1,7 +1,7 @@ # Unsafe KISS RNG ------------------------------------------------------------------------ # Inputs: conf -opt_kiss_rng = get_option('kiss-rng') +opt_kiss_rng = get_option('rng-kiss') conf.set10('HAVE_KISS_RNG', opt_kiss_rng, description: 'Use the unsafe KISS RNG') summary('Unsafe KISS RNG', opt_kiss_rng, section: 'Configuration') diff --git a/meson/libcrypto/meson.build b/meson/libcrypto/meson.build index c88b3ad544..618a132a0b 100644 --- a/meson/libcrypto/meson.build +++ b/meson/libcrypto/meson.build @@ -2,7 +2,7 @@ # Inputs: deps conf # Outputs: have_libcrypto dep_libcrypto -opt_libcrypto = get_option('libcrypto') +opt_libcrypto = get_option('signers-libcrypto') dep_libcrypto = dependency('', required: false) ssldirs = [] diff --git a/meson/libdecaf/meson.build b/meson/libdecaf/meson.build index e52461cf49..a52054f6d2 100644 --- a/meson/libdecaf/meson.build +++ b/meson/libdecaf/meson.build @@ -1,7 +1,7 @@ # Libdecaf-based signers # Inputs: deps conf -opt_libdecaf = get_option('libdecaf') +opt_libdecaf = get_option('signers-libdecaf') dep_libdecaf = dependency('', required: false) if not opt_libdecaf.disabled() diff --git a/meson/libsodium/meson.build b/meson/libsodium/meson.build index 7c96928855..4e4dfec689 100644 --- a/meson/libsodium/meson.build +++ b/meson/libsodium/meson.build @@ -1,7 +1,7 @@ # Libsodium-based signers # Inputs: deps conf -opt_libsodium = get_option('libsodium') +opt_libsodium = get_option('signers-libsodium') dep_libsodium = dependency('libsodium', required: opt_libsodium, not_found_message: 'libsodium not found') if dep_libsodium.found() diff --git a/meson/libssl/meson.build b/meson/libssl/meson.build index 873bd0a207..e6b274cc99 100644 --- a/meson/libssl/meson.build +++ b/meson/libssl/meson.build @@ -1,7 +1,7 @@ # OpenSSL libssl # Inputs: conf deps -opt_libssl = get_option('libssl') +opt_libssl = get_option('tls-libssl') dep_libssl = dependency('libssl', required: opt_libssl) deps += dep_libssl diff --git a/meson_options.txt b/meson_options.txt index 8732734a9c..3bc5789cba 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,50 +1,50 @@ -option('lua', type: 'combo', choices: ['auto', 'luajit', 'lua'], value: 'auto', description: 'Which Lua implementation to use') +option('lua', type: 'combo', choices: ['auto', 'luajit', 'lua'], value: 'auto', description: 'Lua implementation to use') option('hardening', type: 'feature', value: 'auto', description: 'Compiler security checks') option('fortify-source', type: 'combo', choices: ['auto', 'disabled', '1', '2', '3'], value: '2', description: 'Source fortification level') -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, 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('rng-kiss', type: 'boolean', value: false, description: 'Use the unsafe KISS RNG') +option('signers-libsodium', type: 'feature', value: 'auto', description: 'Enable libsodium-based signers') +option('signers-libdecaf', type: 'feature', value: 'auto', description: 'Enable libdecaf-based signers') +option('signers-libcrypto', type: 'string', value: 'auto', description: 'Enable libcrypto-based signers (auto, enabled, disabled, or a path)') +option('tls-libssl', type: 'feature', value: 'auto', description: 'Enable OpenSSL-based TLS') +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 support (requires libcrypto)') -option('unit-tests', type: 'boolean', value: false, description: 'Enable building unit tests') -option('backend-unit-tests', type: 'boolean', value: false, description: 'Enable building backend unit tests') -option('reproducible', type: 'boolean', value: false, description: 'Create reproducible builds. Use this only if you are a distribution maintainer and need reproducible builds. If you compile PowerDNS yourself, leave this disabled, as it might make debugging harder') +option('ipcipher', type: 'feature', value: 'auto', description: 'Enable 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)') option('fuzz-targets', type: 'boolean', value: false, description: 'Enable fuzzing targets') option('verbose-logging', type: 'boolean', value: false, description: 'Enable verbose logging') option('pkcs11', type: 'boolean', value: false, description: 'Enable PKCS11 support (experimental)') option('gss-tsig', type: 'boolean', value: false, description: 'Enable GSS-TSIG support (experimental)') option('socket-dir', type: 'string', value: '/var/run', description: 'Where the control socket lives') -option('module-bind', type: 'boolean', value: true, description: 'Build the bind backend') -option('module-bind-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable bind backend') -option('module-pipe', type: 'boolean', value: false, description: 'Build the pipe backend') -option('module-pipe-dyn', type: 'boolean', value: true, description: 'Build the dynamically loadable pipe backend') -option('module-gmysql', type: 'boolean', value: true, description: 'Build the gmysql backend') -option('module-gmysql-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable gmysql backend') -option('module-godbc', type: 'boolean', value: false, description: 'Build the godbc backend') -option('module-godbc-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable godbc backend') -option('module-gpgsql', type: 'boolean', value: false, description: 'Build the gpgsql backend') -option('module-gpgsql-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable gpgsql backend') -option('module-gsqlite3', type: 'boolean', value: false, description: 'Build the gsqlite3 backend') -option('module-gsqlite3-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable gsqlite3 backend') -option('module-ldap', type: 'boolean', value: false, description: 'Build the LDAP backend') -option('module-ldap-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable LDAP backend') -option('module-remote', type: 'combo', choices: ['disabled', 'with-zeromq', 'without-zeromq'], value: 'with-zeromq', description: 'Build the remote backend') -option('module-remote-dyn', type: 'combo', choices: ['disabled', 'with-zeromq', 'without-zeromq'], value: 'disabled', description: 'Build the dynamically loadable remote backend') -option('module-tinydns', type: 'boolean', value: false, description: 'Build the tinyDNS backend') -option('module-tinydns-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable tinyDNS backend') -option('module-geoip', type: 'boolean', value: false, description: 'Build the GeoIP backend') -option('module-geoip-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable GeoIP backend') -option('module-lmdb', type: 'boolean', value: false, description: 'Build the LMDB backend') -option('module-lmdb-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable LMDB backend') -option('module-lua2', type: 'boolean', value: false, description: 'Build the Lua2 backend') -option('module-lua2-dyn', type: 'boolean', value: false, description: 'Build the dynamically loadable Lua2 backend') -option('tools', type: 'boolean', value: false, description: 'Build the extra tools') -option('ixfrdist', type: 'boolean', value: false, description: 'Build ixfrdist') -option('lua-records', type: 'boolean', value: true, description: 'Build support for Lua records') -option('systemd-service-user', type: 'string', value: 'pdns', description: 'User to run the systemd pdns service as. Only the setuid setting and User field in the systemd unit file are affected, the user is not created') -option('systemd-service-group', type: 'string', value: 'pdns', description: 'Group to run the systemd pdns service under. Only the setgid setting and Group field in the systemd unit file are affected, the group is not created') +option('module-bind', type: 'boolean', value: true, description: 'Bind backend') +option('module-bind-dyn', type: 'boolean', value: false, description: 'Bind backend (dynamically loadable)') +option('module-pipe', type: 'boolean', value: false, description: 'Pipe backend') +option('module-pipe-dyn', type: 'boolean', value: true, description: 'Pipe backend (dynamically loadable)') +option('module-gmysql', type: 'boolean', value: true, description: 'Generic MySQL backend') +option('module-gmysql-dyn', type: 'boolean', value: false, description: 'Generic MySQL backend (dynamically loadable)') +option('module-godbc', type: 'boolean', value: false, description: 'Generic ODBC backend') +option('module-godbc-dyn', type: 'boolean', value: false, description: 'Generic ODBC backend (dynamically loadable)') +option('module-gpgsql', type: 'boolean', value: false, description: 'Generic PostgreSQL backend') +option('module-gpgsql-dyn', type: 'boolean', value: false, description: 'Generic PostgreSQL backend (dynamically loadable)') +option('module-gsqlite3', type: 'boolean', value: false, description: 'Generic SQLite3 backend') +option('module-gsqlite3-dyn', type: 'boolean', value: false, description: 'Generic SQLite3 backend (dynamically loadable)') +option('module-ldap', type: 'boolean', value: false, description: 'LDAP backend') +option('module-ldap-dyn', type: 'boolean', value: false, description: 'LDAP backend (dynamically loadable)') +option('module-remote', type: 'combo', choices: ['disabled', 'with-zeromq', 'without-zeromq'], value: 'with-zeromq', description: 'Remote backend') +option('module-remote-dyn', type: 'combo', choices: ['disabled', 'with-zeromq', 'without-zeromq'], value: 'disabled', description: 'Remote backend (dynamically loadable)') +option('module-tinydns', type: 'boolean', value: false, description: 'TinyDNS backend') +option('module-tinydns-dyn', type: 'boolean', value: false, description: 'TinyDNS backend (dynamically loadable)') +option('module-geoip', type: 'boolean', value: false, description: 'GeoIP backend') +option('module-geoip-dyn', type: 'boolean', value: false, description: 'GeoIP backend (dynamically loadable)') +option('module-lmdb', type: 'boolean', value: false, description: 'LMDB backend') +option('module-lmdb-dyn', type: 'boolean', value: false, description: 'LMDB backend (dynamically loadable)') +option('module-lua2', type: 'boolean', value: false, description: 'Lua2 backend') +option('module-lua2-dyn', type: 'boolean', value: false, description: 'Lua2 backend (dynamically loadable)') +option('tools', type: 'boolean', value: false, description: 'Build extra tools') +option('tools-ixfrdist', type: 'boolean', value: false, description: 'Build ixfrdist') +option('lua-records', type: 'boolean', value: true, description: 'Support Lua records') +option('systemd-service-user', type: 'string', value: 'pdns', description: 'Systemd service user (setuid and unit file; user is not created)') +option('systemd-service-group', type: 'string', value: 'pdns', description: 'Systemd service group (setgid and unit file; group is not created)') option('code-coverage', type: 'boolean', value: false, description: 'Enable code coverage') option('auto-var-init', type: 'combo', value: 'disabled', choices: ['zero', 'pattern', 'disabled'], description: 'Enable initialization of automatic variables')