From a09743c9300f805d6527368ddcf44f5dccd4b366 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 18 Sep 2017 17:34:28 -0700 Subject: [PATCH] meson: Move Xvfb build under an option. Autotools also had it as an option. Signed-off-by: Eric Anholt Reviewed-by: Adam Jackson --- hw/meson.build | 4 +++- meson_options.txt | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) 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')