From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 8 Jan 2010 01:25:27 +0000 (+0000)
Subject: scons: Don't build xlib when dri is enabled.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d699b6720c391a0ab44e09b5fa93fc51b1a13c9e;p=mesa.git

scons: Don't build xlib when dri is enabled.

Hopefully adddresses fdo 25828.
---

diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index cdc31d22a21..a4dabb7804c 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -10,6 +10,10 @@ if 'mesa' not in env['statetrackers']:
     print 'warning: Mesa state tracker disabled: skipping build of xlib libGL.so'
     Return()
 
+if env['dri']:
+    print 'warning: DRI enabled: skipping build of xlib libGL.so'
+    Return()
+
 if 'trace' not in env['drivers']:
     print 'warning: trace pipe driver disabled: skipping build of xlib libGL.so'
     Return()