summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscons/gallium.py2
-rw-r--r--src/glx/SConscript3
2 files changed, 4 insertions, 1 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 75c713d1ce3..c223255abc2 100755
--- 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 664cb86268d..c921eef7037 100644
--- 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()