frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Add an option to build XSELINUX. 

Dependencies are ported from the automake build.

v2: Make it a tristate defaulting to 'auto'.  Use pkg-config for libaudit.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Eric Anholt 2018-08-09 13:02:41 -07:00 committed by Adam Jackson
parent a90f33721e
commit 8a3ae555ef
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
meson.build
View File

@ -442,9 +442,6 @@ elif get_option('mitshm') == 'true'
build_mitshm = true build_mitshm = true
endif endif
# XXX: Allow configuration of these.
build_xselinux = false
m_dep = cc.find_library('m', required : false) m_dep = cc.find_library('m', required : false)
dl_dep = cc.find_library('dl', required : false) dl_dep = cc.find_library('dl', required : false)
@ -506,6 +503,23 @@ inc = include_directories(
'xfixes', 'xfixes',
) )
build_xselinux = false
if get_option('xselinux') != 'false'
dep_selinux = dependency('libselinux', version: '>= 2.0.86',
required: get_option('xselinux') == 'true')
dep_audit = dependency('audit', required: get_option('xselinux') == 'true')
if get_option('xselinux') == 'true'
build_xselinux = true
else
build_xselinux = dep_selinux.found() and dep_audit.found()
endif
if build_xselinux
common_dep += dep_selinux
common_dep += dep_audit
endif
endif
glx_inc = include_directories('glx') glx_inc = include_directories('glx')
top_srcdir_inc = include_directories('.') top_srcdir_inc = include_directories('.')

2
meson_options.txt
View File

@ -80,6 +80,8 @@ option('xres', type: 'boolean', value: true,
description: 'XRes extension') description: 'XRes extension')
option('xace', type: 'boolean', value: true, option('xace', type: 'boolean', value: true,
description: 'X-ACE extension') description: 'X-ACE extension')
option('xselinux', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'XSELINUX extension')
option('xinerama', type: 'boolean', value: true, option('xinerama', type: 'boolean', value: true,
description: 'Xinerama extension') description: 'Xinerama extension')
option('xcsecurity', type: 'boolean', value: false, option('xcsecurity', type: 'boolean', value: false,