From 9fc93b80413d63aeb08b5a17602d111ed3899faf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Sat, 10 Apr 2010 02:00:33 +0100
Subject: [PATCH] scons: Use libdrm options only where needed.

Prevents needless recompiles when switching dri=yes to no.
---
 SConstruct                                    | 10 ----------
 src/gallium/state_trackers/dri/drm/SConscript |  2 ++
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/SConstruct b/SConstruct
index 56d88cc..8b7ae7d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -167,16 +167,6 @@ if platform in ('posix', 'linux', 'freebsd', 'darwin'):
 		'dl',
 	])
 
-# DRI
-if dri:
-	env.ParseConfig('pkg-config --cflags --libs libdrm')
-	env.Append(CPPDEFINES = [
-		('USE_EXTERNAL_DXTN_LIB', '1'), 
-		'IN_DRI_DRIVER',
-		'GLX_DIRECT_RENDERING',
-		'GLX_INDIRECT_RENDERING',
-	])
-
 # LLVM support in the Draw module
 if drawllvm:
     env.Append(CPPDEFINES = ['DRAW_LLVM'])
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index b9726ee..1dfaa40 100644
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -7,6 +7,8 @@ if env['dri']:
 
     env = env.Clone()
 
+    env.ParseConfig('pkg-config --cflags --libs libdrm')
+
     env.Append(CPPPATH = [
         '#/src/mesa',
 	'#/src/gallium/state_trackers/dri/common',
-- 
2.7.4