st/glx: improved depth/stencil format selection code

[mesa.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 76ab9025e23e44a1c69746f7e44a790de33453af..ea63b90f46fb19ce57c632948e1d7eeb1e243ee9 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -83,6 +83,11 @@ machine = env['machine']
 platform = env['platform']
 drawllvm = 'llvmpipe' in env['drivers']
 
+# LLVM support in the Draw module
+if drawllvm:
+        env.Tool('llvm')
+        if not env.has_key('LLVM_VERSION'):
+           drawllvm = False
 
 # derived options
 x86 = machine == 'x86'
@@ -168,10 +173,7 @@ if dri:
 
 # LLVM support in the Draw module
 if drawllvm:
-       # See also http://www.scons.org/wiki/UsingPkgConfig
-        # currently  --ldflags --libsdisabled since the driver will force the correct linkage
-       env.ParseConfig('llvm-config --cflags backend bitreader engine instrumentation interpreter ipo')
-       env.Append(CPPDEFINES = ['DRAW_LLVM'])
+    env.Append(CPPDEFINES = ['DRAW_LLVM'])
 
 # libGL
 if platform in ('linux', 'freebsd', 'darwin'):
@@ -223,8 +225,10 @@ SConscript(
        duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )
 
+env.Default('src')
+
 SConscript(
-       'progs/SConscript',
-       variant_dir = os.path.join('progs', env['build']),
-       duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
+    'progs/SConscript',
+    variant_dir = os.path.join('progs', env['build']),
+    duplicate = 0 # http://www.scons.org/doc/0.97/HTML/scons-user/x2261.html
 )