Mesa (master): Attempt to fix AppVeyor build, round 2

[Nicolai Hähnle]

Module: Mesa
Branch: master
Commit: 90c8f17cf8fbe696dede841b0f3faca2556854fe
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=90c8f17cf8fbe696dede841b0f3faca2556854fe

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Mon Jul 31 17:17:44 2017 +0200

Attempt to fix AppVeyor build, round 2

---

 src/util/SConscript | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/util/SConscript b/src/util/SConscript
index 00bd89c013..0c3c98a5f4 100644
--- a/src/util/SConscript
+++ b/src/util/SConscript
@@ -31,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',