X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=584c3217db81e498db5ae4be3ad67ec3faf994e7;hb=7c691ffe57bd1939572a94736bedf6ac3a3f7b1a;hp=ec88386e9f609688cdc20d8036156db28b2ee4e2;hpb=c2628279c5e32edb8a52ace36e7b096e417e6262;p=senf.git diff --git a/SConstruct b/SConstruct index ec88386..584c321 100644 --- a/SConstruct +++ b/SConstruct @@ -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