X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=584c3217db81e498db5ae4be3ad67ec3faf994e7;hb=c505c034e5fdc932c02aa3dc3847a5551011d87e;hp=98afe0510b164f32dc43ffdd332d4d2874ee8375;hpb=7dfac76816b629e4482401f464d3289e783b4422;p=senf.git

diff --git a/SConstruct b/SConstruct
index 98afe05..584c321 100644
--- a/SConstruct
+++ b/SConstruct
@@ -121,8 +121,8 @@ env.SetDefault(
     GENHTML           = "genhtml",
     VALGRIND          = "valgrind",
     SCONSBIN          = env.File("#/tools/scons"),
-    SCONSARGS         = [ '-Q', '-j$CONCURRENCY_LEVEL', 'debug=$debug', 'final=$final' ] + \
-        [ '%s=%s' % (k,v) for k,v in ARGUMENTS.iteritems() ],
+    SCONSARGS         = ([ '-Q', '-j$CONCURRENCY_LEVEL' ] + 
+                         [ '%s=%s' % (k,v) for k,v in ARGUMENTS.iteritems() ]),
     SCONS             = "@$SCONSBIN $SCONSARGS",
     CONCURRENCY_LEVEL = env.GetOption('num_jobs') or 1,
     TOPDIR            = env.Dir('#').abspath,
@@ -176,14 +176,12 @@ def CheckValgrindWildcards(context):
     context.Result( ret[0] )
     return ret[0]
 
-# Default configuration (boost stuff)
-senfutil.Configure(env)
+def customChecks(conf):
+    conf.env.Replace(
+        HAVE_VALGRIND  = conf.CheckValgrind() and conf.CheckValgrindWildcards()
+        )
 
-conf = env.Configure(clean=False, help=False, custom_tests = senfconf.Tests())
-env.Replace(
-    HAVE_VALGRIND  = conf.CheckValgrind() and conf.CheckValgrindWildcards()
-)
-conf.Finish()
+senfutil.Configure(env, customChecks)
 
 # Only add this here, after all configure checks have run