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

meson: Move Xvfb build under an option. 

Autotools also had it as an option.

Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Eric Anholt 2017-09-18 17:34:28 -07:00 committed by Adam Jackson
parent de3b618691
commit a09743c930
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/meson.build
View File

@ -6,7 +6,9 @@ if get_option('dmx')
subdir('dmx') subdir('dmx')
endif endif
subdir('vfb') if get_option('xvfb')
subdir('vfb')
endif
if build_xnest if build_xnest
subdir('xnest') subdir('xnest')

2
meson_options.txt
View File

@ -10,6 +10,8 @@ option('xnest', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
description: 'Enable Xnest nested X server') description: 'Enable Xnest nested X server')
option('dmx', type: 'boolean', value: false, option('dmx', type: 'boolean', value: false,
description: 'Enable DMX nested X server') description: 'Enable DMX nested X server')
option('xvfb', type: 'boolean', value: true,
description: 'Enable Xvfb X server')
option('xwin', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', option('xwin', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto',
description: 'Enable XWin X server') description: 'Enable XWin X server')