X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsite_tools%2FBoost.py;h=326bf5f9dff4bbe519fc6c893c80ab6c5618567d;hb=74febc7a9abc84c4939269b3443d15fc27f4e960;hp=7e20e2bbc1ce7a31d1763af0848d3ccaee91ddc5;hpb=69a4d13fef0b93fb9f834977b880d40101a89d6a;p=senf.git

diff --git a/site_scons/site_tools/Boost.py b/site_scons/site_tools/Boost.py
index 7e20e2b..326bf5f 100644
--- a/site_scons/site_tools/Boost.py
+++ b/site_scons/site_tools/Boost.py
@@ -88,7 +88,7 @@ def BoostUnitTest(env, target=None, source=None,  **kw):
     stampnode = target.dir.File('.' + target.name + '.stamp')
 
     bin = env.Program(binnode, source,
-                      LIBS = env['LIBS'] + [ '$TEST_EXTRA_LIBS' ],
+                      LIBS = env['LIBS'] + kw.pop('TEST_EXTRA_LIBS', ['$TEST_EXTRA_LIBS']),
                       _LIBFLAGS = ' -Wl,-Bstatic -l$BOOSTTESTLIB -Wl,-Bdynamic ' + env['_LIBFLAGS'],
                       **kw)
 
@@ -198,8 +198,10 @@ def CheckBoostVariants(context, *variants):
         print  "Using %s boost variant." % (
             useVariant and "'%s'" % useVariant or "default")
     context.env.Replace( BOOST_VARIANT = useVariant )
+    context.env.Append( HAS_BOOST_SYSTEM = context.sconf.CheckLib('boost_system', language='c++', autoadd=False)) 
     return useVariant
 
+
 def generate(env):
     env.SetDefault(
         BOOST_VARIANT     = None,
@@ -210,6 +212,10 @@ def generate(env):
         BOOSTFSLIB        = 'boost_filesystem$_BOOST_VARIANT',
         BOOSTIOSTREAMSLIB = 'boost_iostreams$_BOOST_VARIANT',
         BOOSTSIGNALSLIB   = 'boost_signals$_BOOST_VARIANT',
+        BOOSTDATETIMELIB  = 'boost_date_time$_BOOST_VARIANT',
+        
+        _BOOSTSYSTEMLIB   = '${HAS_BOOST_SYSTEM and "boost_system" or ""}',
+        BOOSTSYSTEMLIB    = '$_BOOSTSYSTEMLIB',
 
         BOOSTTESTARGS     = [ '--build_info=yes', '--log_level=test_suite' ],
         )