diff options
| author | Eric Anholt <eric@anholt.net> | 2017-09-18 17:34:28 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-09-20 13:19:21 -0400 |
| commit | a09743c9300f805d6527368ddcf44f5dccd4b366 (patch) | |
| tree | 95aa405a9bae5e7a21a50dc247b472be0cd48dbc | |
| parent | de3b61869140768335daed0e855a5ae4bdb75020 (diff) | |
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>
| -rw-r--r-- | hw/meson.build | 4 | ||||
| -rw-r--r-- | meson_options.txt | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/hw/meson.build b/hw/meson.build index c0d2db3f5..96c1559c3 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -6,7 +6,9 @@ if get_option('dmx') subdir('dmx') endif -subdir('vfb') +if get_option('xvfb') + subdir('vfb') +endif if build_xnest subdir('xnest') diff --git a/meson_options.txt b/meson_options.txt index fc66f9f08..b1ee6ccc5 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,6 +10,8 @@ option('xnest', type: 'combo', choices: ['yes', 'no', 'auto'], value: 'auto', description: 'Enable Xnest nested X server') option('dmx', type: 'boolean', value: false, 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', description: 'Enable XWin X server') |