diff options
author | Martin Pitt <martinpitt@users.noreply.github.com> | 2017-07-28 09:51:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-28 09:51:29 +0200 |
commit | d74af49c0b15435417aa253059f28b8237e22833 (patch) | |
tree | fc3cb8af86c5ce4d4b2b8a6341486945a106c966 | |
parent | 522aa9f5f8755d7389131da41bd60b6276917ff2 (diff) | |
parent | 9d39c1bf2969ded2b6c040a2594ac97eec1472cf (diff) | |
download | systemd-d74af49c0b15435417aa253059f28b8237e22833.tar.gz |
Merge pull request #6461 from keszybz/meson-options-fix
Meson options fix
-rw-r--r-- | meson.build | 59 | ||||
-rw-r--r-- | meson_options.txt | 6 |
2 files changed, 34 insertions, 31 deletions
diff --git a/meson.build b/meson.build index 867a56ee81..a429d7b112 100644 --- a/meson.build +++ b/meson.build @@ -845,6 +845,23 @@ else libqrencode = [] endif +want_gcrypt = get_option('gcrypt') +if want_gcrypt != 'false' + libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true') + libgpg_error = cc.find_library('gpg-error', required : want_gcrypt == 'true') + + have_deps = libgcrypt.found() and libgpg_error.found() + conf.set('HAVE_GCRYPT', have_deps) + if not have_deps + # link to neither of the libs if one is not found + libgcrypt = [] + libgpg_error = [] + endif +else + libgcrypt = [] + libgpg_error = [] +endif + want_gnutls = get_option('gnutls') if want_gnutls != 'false' libgnutls = dependency('gnutls', @@ -900,6 +917,16 @@ else liblz4 = [] endif +want_xkbcommon = get_option('xkbcommon') +if want_xkbcommon != 'false' + libxkbcommon = dependency('xkbcommon', + version : '>= 0.3.0', + required : want_xkbcommon == 'true') + conf.set('HAVE_XKBCOMMON', libxkbcommon.found()) +else + libxkbcommon = [] +endif + want_glib = get_option('glib') if want_glib != 'false' libglib = dependency('glib-2.0', @@ -918,16 +945,6 @@ else libgio = [] endif -want_xkbcommon = get_option('xkbcommon') -if want_xkbcommon != 'false' - libxkbcommon = dependency('xkbcommon', - version : '>= 0.3.0', - required : want_xkbcommon == 'true') - conf.set('HAVE_XKBCOMMON', libxkbcommon.found()) -else - libxkbcommon = [] -endif - want_dbus = get_option('dbus') if want_dbus != 'false' libdbus = dependency('dbus-1', @@ -938,23 +955,6 @@ else libdbus = [] endif -want_gcrypt = get_option('gcrypt') -if want_gcrypt != 'false' - libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true') - libgpg_error = cc.find_library('gpg-error', required : want_gcrypt == 'true') - - have_deps = libgcrypt.found() and libgpg_error.found() - conf.set('HAVE_GCRYPT', have_deps) - if not have_deps - # link to neither of the libs if one is not found - libgcrypt = [] - libgpg_error = [] - endif -else - libgcrypt = [] - libgpg_error = [] -endif - default_dnssec = get_option('default-dnssec') if default_dnssec != 'no' and not conf.get('HAVE_GCRYPT', false) message('default-dnssec cannot be set to yes or allow-downgrade when gcrypt is disabled. Setting default-dnssec to no.') @@ -2531,6 +2531,9 @@ foreach tuple : [ endforeach status += [ + '', 'enabled features: @0@'.format(', '.join(found)), - 'disabled features: @0@'.format(', '.join(missing))] + '', + 'disabled features: @0@'.format(', '.join(missing)), + ''] message('\n '.join(status)) diff --git a/meson_options.txt b/meson_options.txt index 0cd8fb02e7..70d7f6b036 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -47,7 +47,7 @@ option('resolve', type : 'boolean', description : 'systemd-resolved stack') option('efi', type : 'boolean', description : 'enable systemd-boot and bootctl') -option('tpm', type : 'boolean', value : true, +option('tpm', type : 'boolean', description : 'TPM should be used to log events and extend the registers') option('environment-d', type : 'boolean', description : 'support for environment.d') @@ -69,7 +69,7 @@ option('timedated', type : 'boolean', description : 'install the systemd-timedated daemon') option('timesyncd', type : 'boolean', description : 'install the systemd-timesyncd daemon') -option('remote', type : 'boolean', +option('remote', type : 'combo', choices : ['auto', 'true', 'false'], description : 'support for "journal over the network"') option('myhostname', type : 'boolean', description : 'nss-myhostname support') @@ -87,7 +87,7 @@ option('sysusers', type : 'boolean', description : 'support for the sysusers configuration') option('tmpfiles', type : 'boolean', description : 'support for tmpfiles.d') -option('importd', type : 'boolean', +option('importd', type : 'combo', choices : ['auto', 'true', 'false'], description : 'install the systemd-importd daemon') option('hwdb', type : 'boolean', description : 'support for the hardware database') |