shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-05 13:18:06 +03:00
Code

build-sys: add libfido2 as optional dependency

Browse Source
This commit is contained in:
Lennart Poettering 2020-04-14 15:54:52 +02:00
parent c0bde0d240
commit af4fbd463f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -1153,6 +1153,17 @@ else
endif endif
conf.set10('HAVE_P11KIT', have) conf.set10('HAVE_P11KIT', have)
want_libfido2 = get_option('libfido2')
if want_libfido2 != 'false' and not skip_deps
libfido2 = dependency('libfido2',
required : want_libfido2 == 'true')
have = libfido2.found()
else
have = false
libfido2 = []
endif
conf.set10('HAVE_LIBFIDO2', have)
want_elfutils = get_option('elfutils') want_elfutils = get_option('elfutils')
if want_elfutils != 'false' and not skip_deps if want_elfutils != 'false' and not skip_deps
libdw = dependency('libdw', libdw = dependency('libdw',
@ -3575,6 +3586,7 @@ foreach tuple : [
['pwquality'], ['pwquality'],
['libfdisk'], ['libfdisk'],
['p11kit'], ['p11kit'],
['libfido2'],
['AUDIT'], ['AUDIT'],
['IMA'], ['IMA'],
['AppArmor'], ['AppArmor'],

2
meson_options.txt
View File

@ -312,6 +312,8 @@ option('openssl', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'openssl support') description : 'openssl support')
option('p11kit', type : 'combo', choices : ['auto', 'true', 'false'], option('p11kit', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'p11kit support') description : 'p11kit support')
option('libfido2', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'FIDO2 support')
option('elfutils', type : 'combo', choices : ['auto', 'true', 'false'], option('elfutils', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'elfutils support') description : 'elfutils support')
option('zlib', type : 'combo', choices : ['auto', 'true', 'false'], option('zlib', type : 'combo', choices : ['auto', 'true', 'false'],