util: use standard name for strncat()

[mesa.git] / src / util / SConscript

diff --git a/src/util/SConscript b/src/util/SConscript
index 582592c203f28b2aaade9445e2bbb4f61c3d061a..66a0d1c04ff1fb8178ab029ac70062544319e9b4 100644 (file)
--- a/src/util/SConscript
+++ b/src/util/SConscript
@@ -2,10 +2,6 @@ import common
 
 Import('*')
 
-SConscript([
-   'xmlpool',
-])
-
 from sys import executable as python_cmd
 
 env = env.Clone()
@@ -35,15 +31,17 @@ source_lists = env.ParseSourceList('Makefile.sources')
 
 mesautil_sources = (
     source_lists['MESA_UTIL_FILES'] +
-    source_lists['MESA_UTIL_GENERATED_FILES'] +
-    source_lists['XMLCONFIG_FILES']
+    source_lists['MESA_UTIL_GENERATED_FILES']
 )
 
 mesautilenv = env.Clone()
 
-mesautilenv.AppendUnique(LIBS = [
-    'expat',
-])
+if env['dri']:
+    mesautil_sources += source_lists['XMLCONFIG_FILES']
+
+    mesautilenv.AppendUnique(LIBS = [
+        'expat',
+    ])
 
 mesautil = mesautilenv.ConvenienceLibrary(
     target = 'mesautil',
@@ -65,3 +63,10 @@ roundeven_test = env.Program(
     source = ['roundeven_test.c'],
 )
 env.UnitTest("roundeven_test", roundeven_test)
+
+env.Prepend(LIBS = [mesautil])
+mesa_sha1_test = env.Program(
+    target = 'mesa-sha1_test',
+    source = ['mesa-sha1_test.c'],
+)
+env.UnitTest("mesa-sha1_test", mesa_sha1_test)