summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-11-03 15:21:51 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-11-03 15:21:51 +0000
commitd49dfe66cfb0e13094e5918b9857c4eb474a53f6 (patch)
treea55467e2179e622d1d3657a5e15593ca8b964ef7
parent12376d8ea384f8a984daf6892a2bd07a70604962 (diff)
st/xorg: Detect libkms with scons too.
-rw-r--r--scons/gallium.py1
-rw-r--r--src/gallium/state_trackers/xorg/SConscript3
2 files changed, 4 insertions, 0 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index 3c0ff90538..7374cf58d3 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -559,6 +559,7 @@ def generate(env):
pkg_config_modules(env, 'x11', ['x11', 'xext'])
pkg_config_modules(env, 'dri', ['libdrm'])
pkg_config_modules(env, 'xorg', ['xorg-server'])
+ pkg_config_modules(env, 'kms', ['libkms'])
# Custom builders and methods
env.Tool('custom')
diff --git a/src/gallium/state_trackers/xorg/SConscript b/src/gallium/state_trackers/xorg/SConscript
index ffaa1c2684..bc7821f8a8 100644
--- a/src/gallium/state_trackers/xorg/SConscript
+++ b/src/gallium/state_trackers/xorg/SConscript
@@ -14,6 +14,9 @@ env.Append(CPPPATH = [
env.ParseConfig('pkg-config --cflags --libs libdrm xorg-server')
+if env['kms']:
+ env.Append(CPPDEFINES = ['HAVE_LIBKMS'])
+
conf = env.Configure()
if conf.CheckHeader('X11/extensions/dpmsconst.h'):