Mesa (master): st/xorg: Detect libkms with scons too.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Nov 3 15:22:12 UTC 2010
Module: Mesa
Branch: master
Commit: d49dfe66cfb0e13094e5918b9857c4eb474a53f6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d49dfe66cfb0e13094e5918b9857c4eb474a53f6
Author: José Fonseca <jfonseca at vmware.com>
Date: Wed Nov 3 15:21:51 2010 +0000
st/xorg: Detect libkms with scons too.
---
scons/gallium.py | 1 +
src/gallium/state_trackers/xorg/SConscript | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/scons/gallium.py b/scons/gallium.py
index 3c0ff90..7374cf5 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 ffaa1c2..bc7821f 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'):
More information about the mesa-commit
mailing list