swrast: fix more fetch_texel function names

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 834e9d58a89f95afaf54891334cf60b67cb6ac1d..0e10818ba17bd3e4b840b8b944f343f9f9f6d406 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -59,18 +59,13 @@ else:
 
 Help(opts.GenerateHelpText(env))
 
-# fail early for a common error on windows
-if env['gles']:
-    try:
-        import libxml2
-    except ImportError:
-        raise SCons.Errors.UserError, "GLES requires libxml2-python to build"
-
 #######################################################################
 # Environment setup
 
+with open("VERSION") as f:
+  mesa_version = f.read().strip()
 env.Append(CPPDEFINES = [
-    ('PACKAGE_VERSION', '\\"9.2.0-devel\\"'),
+    ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
     ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
 ])