mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-30 13:53:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6461 from keszybz/meson-options-fix

Browse Source 
Meson options fix
This commit is contained in:
Martin Pitt 2017-07-28 09:51:29 +02:00 committed by GitHub
commit d74af49c0b
2 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
meson.build
View File

@ -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))

6
meson_options.txt
View File

@ -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')