scons: Fixups for the introduction of the xlib state_tracker.

Not quite working yet; glxinfo complains about glXChooseVisual being undefined.

src/gallium/SConscript

@@ -27,6 +27,7 @@ for driver in env['drivers']:
 	SConscript(os.path.join('drivers', driver, 'SConscript'))
 
 SConscript('state_trackers/python/SConscript')
+SConscript('state_trackers/glx/xlib/SConscript')
 
 if platform == 'windows':
 	SConscript('state_trackers/wgl/SConscript')

src/gallium/state_trackers/glx/xlib/SConscript

@@ -0,0 +1,26 @@
+#######################################################################
+# SConscript for xlib state_tracker
+
+Import('*')
+
+if env['platform'] == 'linux' \
+        and 'mesa' in env['statetrackers'] \
+        and ('softpipe' or 'i915simple' or 'trace') in env['drivers'] \
+        and not env['dri']:
+
+    env = env.Clone()
+
+    env.Append(CPPPATH = [
+        '#/src/mesa',
+        '#/src/mesa/main',
+    ])
+
+    st_xlib = env.ConvenienceLibrary(
+	target = 'st_xlib',
+	source = [ 'glxapi.c',
+		'fakeglx.c',
+		'fakeglx_fonts.c',
+		'xm_api.c',
+		]
+    )
+    Export('st_xlib')

src/gallium/winsys/xlib/SConscript

@@ -15,13 +15,7 @@ if env['platform'] == 'linux' \
         '#/src/mesa/main',
     ])
 
-    sources = [
-        'glxapi.c',
-        'fakeglx.c',
-        'xfonts.c',
-        'xm_api.c',
-        'xm_winsys.c',
-    ]
+    sources = [];
 
     drivers = [];
         
@@ -43,7 +37,7 @@ if env['platform'] == 'linux' \
     libgl = env.SharedLibrary(
         target ='GL',
         source = sources,
-        LIBS = glapi + mesa + drivers + auxiliaries + env['LIBS'],
+        LIBS = st_xlib + glapi + mesa + drivers + auxiliaries + env['LIBS'],
     )
 
     env.InstallSharedLibrary(libgl, version=(1, 5))