shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

meson: add option to disable libacl support

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-21 13:53:59 -04:00
parent dc25d2adb5
commit 36f0387efc
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
meson.build
View File

@ -660,6 +660,17 @@ if want_polkit != 'false'
endif endif
endif endif
want_acl = get_option('acl')
if want_acl != 'false'
libacl = cc.find_library('acl', required : want_acl == 'true')
if libacl.found()
conf.set('HAVE_ACL', 1)
m4_defines += ['-DHAVE_ACL']
endif
else
libacl = []
endif
want_audit = get_option('audit') want_audit = get_option('audit')
if want_audit != 'false' if want_audit != 'false'
libaudit = dependency('audit', required : want_audit == 'true') libaudit = dependency('audit', required : want_audit == 'true')
@ -845,12 +856,6 @@ else
liblz4 = [] liblz4 = []
endif endif
libacl = cc.find_library('acl', required : false)
if libacl.found()
conf.set('HAVE_ACL', 1)
m4_defines += ['-DHAVE_ACL']
endif
want_glib = get_option('glib') want_glib = get_option('glib')
if want_glib != 'false' if want_glib != 'false'
libglib = dependency('glib-2.0', libglib = dependency('glib-2.0',

2
meson_options.txt
View File

@ -175,6 +175,8 @@ option('polkit', type : 'combo', choices : ['auto', 'true', 'false'],
option('ima', type : 'boolean', option('ima', type : 'boolean',
description : 'IMA support') description : 'IMA support')
option('acl', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'libacl support')
option('audit', type : 'combo', choices : ['auto', 'true', 'false'], option('audit', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'libaudit support') description : 'libaudit support')
option('blkid', type : 'combo', choices : ['auto', 'true', 'false'], option('blkid', type : 'combo', choices : ['auto', 'true', 'false'],