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

Conflicts:

	configs/default

1 files changed, 33 insertions, 31 deletions

diff --git a/src/gallium/winsys/dri/intel/SConscript b/src/gallium/winsys/dri/intel/SConscript
index 0ad19d42a8..6a4f50afcc 100644
--- a/src/gallium/winsys/dri/intel/SConscript
+++ b/src/gallium/winsys/dri/intel/SConscript
@@ -1,39 +1,41 @@
 Import('*')
 
-env = drienv.Clone()
+if 'mesa' in env['statetrackers']:
 
-env.Append(CPPPATH = [
-	'../intel',
-	'server'
-])
+	env = drienv.Clone()
 
-#MINIGLX_SOURCES = server/intel_dri.c
+	env.Append(CPPPATH = [
+		'../intel',
+		'server'
+	])
 
-DRIVER_SOURCES = [
-	'intel_winsys_pipe.c',
-	'intel_winsys_softpipe.c',
-	'intel_winsys_i915.c',
-	'intel_batchbuffer.c',
-	'intel_swapbuffers.c',
-	'intel_context.c',
-	'intel_lock.c',
-	'intel_screen.c',
-	'intel_batchpool.c',
-]
+	#MINIGLX_SOURCES = server/intel_dri.c
 
-sources = \
-	COMMON_GALLIUM_SOURCES + \
-	COMMON_BM_SOURCES + \
-	DRIVER_SOURCES
+	DRIVER_SOURCES = [
+		'intel_winsys_pipe.c',
+		'intel_winsys_softpipe.c',
+		'intel_winsys_i915.c',
+		'intel_batchbuffer.c',
+		'intel_swapbuffers.c',
+		'intel_context.c',
+		'intel_lock.c',
+		'intel_screen.c',
+		'intel_batchpool.c',
+	]
 
-drivers = [
-	softpipe,
-	i915simple
-]
+	sources = \
+		COMMON_GALLIUM_SOURCES + \
+		COMMON_BM_SOURCES + \
+		DRIVER_SOURCES
 
-# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
-env.SharedLibrary(
-	target ='i915tex_dri.so',
-	source = sources,
-	LIBS = drivers + mesa + auxiliaries + env['LIBS'],
-)
\ No newline at end of file
+	drivers = [
+		softpipe,
+		i915simple
+	]
+
+	# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
+	env.SharedLibrary(
+		target ='i915tex_dri.so',
+		source = sources,
+		LIBS = drivers + mesa + auxiliaries + env['LIBS'],
+	)