[PATCH xserver 1/6] meson: Move Xvfb build under an option.

Eric Anholt eric at anholt.net
Tue Sep 19 00:34:28 UTC 2017


Autotools also had it as an option.

Signed-off-by: Eric Anholt <eric at anholt.net>
---
 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 c0d2db3f5c85..96c1559c348b 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 fc66f9f08e35..b1ee6ccc5b39 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')
 
-- 
2.14.1



More information about the xorg-devel mailing list