Toplevel directory cleanup

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index 62d7d2f..5e14e7d 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -3,18 +3,13 @@
 import sys, glob, os.path, fnmatch
 import SENFSCons, senfutil
 
-# Fix for SCons 0.97 compatibility
-try:
-    BoolVariable
-except NameError:
-    BoolVariable = BoolOption
-
 ###########################################################################
 # Load utilities and setup libraries and configure build
 
 env = Environment()
 
 env.Decider('MD5-timestamp')
+env.EnsureSConsVersion(1,2)
 
 # Load all the local SCons tools
 env.Tool('Doxygen')
@@ -177,7 +172,7 @@ env.PhonyTarget('valgrind', [ 'all_tests' ], [ """
             echo;
             echo "Running $$test";
             echo;
-            valgrind --tool=memcheck --error-exitcode=99 --suppressions=valgrind.sup 
+            valgrind --tool=memcheck --error-exitcode=99 --suppressions=tools/valgrind.sup 
                 $$test $BOOSTTESTARGS;
             [ $$? -ne 99 ] || exit 1;
         done