scons: Also require recent XCB.

And don't trip when it's not found -- simply skip building src/glx.

diff --git a/scons/gallium.py b/scons/gallium.py
index 75c713d1ce3bac8bcecf2e1056b59cd6913933fb..c223255abc273738c4b5e0efa15af3fbafd24c93 100755 (executable)
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -516,7 +516,7 @@ def generate(env):
     createInstallMethods(env)
 
     env.PkgCheckModules('X11', ['x11', 'xext', 'xdamage', 'xfixes'])
-    env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx'])
+    env.PkgCheckModules('XCB', ['x11-xcb', 'xcb-glx >= 1.8.1'])
     env.PkgCheckModules('XF86VIDMODE', ['xxf86vm'])
     env.PkgCheckModules('DRM', ['libdrm >= 2.4.24'])
     env.PkgCheckModules('DRM_INTEL', ['libdrm_intel >= 2.4.30'])

diff --git a/src/glx/SConscript b/src/glx/SConscript
index 664cb86268da9dd228e0ae21dd0dc768b9a10bdb..c921eef70372c564920ad358883a56164d6b3683 100644 (file)
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -1,5 +1,8 @@
 Import('*')
 
+if not env['x11'] or not env['xcb'] or not env['drm']:
+    Return()
+
 from sys import executable as python_cmd
 
 env = env.Clone()