andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meson: Make Security extension optional

Browse Source 
Just mimic autoconf file, Security extension needs X-ACE extension

Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Laurent Carlier 2018-02-13 22:33:51 +01:00 committed by Adam Jackson
parent 43ef94068e
commit d1fdddeb76
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -346,11 +346,17 @@ build_res = get_option('xres')
build_xace = get_option('xace')
build_xinerama = get_option('xinerama')
build_xsecurity = get_option('xcsecurity')
if build_xsecurity
if not build_xace
error('cannot build Security extension without X-ACE')
endif
endif
# XXX: Allow configuration of these.
build_apm = false
build_acpi = false
build_mitshm = true
build_xsecurity = true
build_xselinux = false
build_xv = true
build_dga = false

2
meson_options.txt
View File

@ -69,6 +69,8 @@ option('xace', type: 'boolean', value: true,
description: 'X-ACE extension')
option('xinerama', type: 'boolean', value: true,
description: 'Xinerama extension')
option('xcsecurity', type: 'boolean', value: false,
description: 'Security extension')
option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')