Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

Conflicts:

	configs/default

1 files changed, 26 insertions, 24 deletions

diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index 218b89285f..5e98a36abc 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -3,30 +3,32 @@
 
 Import('*')
 
-env = env.Clone()
+if env['platform'] == 'linux' and 'mesa' in env['statetrackers'] and not env['dri']:
 
-env.Append(CPPPATH = [
-	'#/src/mesa',
-	'#/src/mesa/main',
-])
+	env = env.Clone()
 
-sources = [
-	'glxapi.c',
-	'fakeglx.c',
-	'xfonts.c',
-	'xm_api.c',
-	'xm_winsys.c',
-	'xm_winsys_aub.c',
-	'brw_aub.c',
-]
-	
-drivers = [
-	softpipe,
-]
+	env.Append(CPPPATH = [
+		'#/src/mesa',
+		'#/src/mesa/main',
+	])
 
-# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
-env.SharedLibrary(
-	target ='GL',
-	source = sources,
-	LIBS = glapi + mesa + drivers + auxiliaries + env['LIBS'],
-)
+	sources = [
+		'glxapi.c',
+		'fakeglx.c',
+		'xfonts.c',
+		'xm_api.c',
+		'xm_winsys.c',
+		'xm_winsys_aub.c',
+		'brw_aub.c',
+	]
+		
+	drivers = [
+		softpipe,
+	]
+
+	# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
+	env.SharedLibrary(
+		target ='GL',
+		source = sources,
+		LIBS = glapi + mesa + drivers + auxiliaries + env['LIBS'],
+	)