X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=site_scons%2Fsenfutil.py;h=275ea1df42fc468f9fe9b8e81ca5a247df1321eb;hb=fd884ba2ba992b5032c0644ade77613074216767;hp=546846363b91f8fb4c7bc712ba048d7bb85d7cc5;hpb=3bd04877a6233d5f95c0b790e8ee4eab24317f55;p=senf.git

diff --git a/site_scons/senfutil.py b/site_scons/senfutil.py
index 5468463..275ea1d 100644
--- a/site_scons/senfutil.py
+++ b/site_scons/senfutil.py
@@ -78,10 +78,6 @@ def SetupForSENF(env, senf_path = []):
         LIBS              = [ 'senf', 'rt', '$BOOSTREGEXLIB',
                               '$BOOSTIOSTREAMSLIB', '$BOOSTSIGNALSLIB',
                               '$BOOSTFSLIB' ],
-        BOOSTREGEXLIB     = 'boost_regex',
-        BOOSTIOSTREAMSLIB = 'boost_iostreams',
-        BOOSTSIGNALSLIB   = 'boost_signals',
-        BOOSTFSLIB        = 'boost_filesystem',
         
         CXXFLAGS          = [ '-Wno-long-long', '$CXXFLAGS_' ],
         CXXFLAGS_         = BuildTypeOptions('CXXFLAGS'),
@@ -173,6 +169,11 @@ def DefaultOptions(env):
         LINKFLAGS_normal = [ '-Wl,-S' ],
         LINKFLAGS_debug  = [ '-g' ],
     )
+    # ugly hack for ubuntu karmic 
+    # ToDo: auto-configure alike support
+    if os.path.exists('/usr/lib/libboost_regex-mt.so'):
+        env.Append( BOOST_VARIANT = '-mt' )
+
 
 def Glob(env, exclude=[], subdirs=[]):
     testSources = env.Glob("*.test.cc", strings=True)
@@ -262,7 +263,8 @@ def Doxygen(env, doxyheader=None, doxyfooter=None, doxycss=None, mydoxyfile=Fals
                                      'tagfiles'   : '$TAGFILES',
                                      'output_dir' : 'doc',
                                      'html_dir'   : 'html',
-                                     'html'       : 'YES' },
+                                     'html'       : 'YES',
+                                     'DOXYGEN'    : '$DOXYGEN' },
                       TAGFILES   = tagfiles, 
                       DOCLIBDIR  = libdir,
                       DOXYGENCOM = "$DOCLIBDIR/doxygen.sh $DOXYOPTS $SOURCE")