X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senfscons%2Fsenfutil.py;h=249a78d7dfc25fd1b55b1be38ae65ad2d41ea8d5;hb=7baaacae27c02c86ceda5c7ee41d3172d1e23ffa;hp=a0954a8b2e31f842dd5174bb1067b3b1b31baa1b;hpb=f2cc6f8a4ca99301f9f26156803e541ec2dff66b;p=senf.git

diff --git a/senfscons/senfutil.py b/senfscons/senfutil.py
index a0954a8..249a78d 100644
--- a/senfscons/senfutil.py
+++ b/senfscons/senfutil.py
@@ -8,7 +8,9 @@ from SCons.Script import *
 # c) check for a local SENF, set options accordingly and update that SENF if needed
 
 def SetupForSENF(env):
-    env.Append( LIBS           = [ 'senf', 'iberty', 'boost_regex', 'boost_iostreams' ],
+    env.Append( LIBS           = [ 'senf', 'readline', 'rt', '$BOOSTREGEXLIB', '$BOOSTIOSTREAMSLIB' ],
+                BOOSTREGEXLIB  = 'boost_regex',
+                BOOSTIOSTREAMSLIB = 'boost_iostreams',
                 CXXFLAGS       = [ '-Wno-long-long',
                                    '${"$CXXFLAGS_"+(final and "final" or "debug")}' ],
                 LINKFLAGS      = [ '${"$LINKFLAGS_"+(final and "final" or "debug")}' ],
@@ -35,8 +37,6 @@ def SetupForSENF(env):
     opts.Add( BoolOption('final', 'Build final (optimized) build', False) )
     opts.Update(env)
 
-    print env.subst('$LOGLEVELS')
-
     if env.subst('$LOGLEVELS'):
         env.Append( expandLogOption=expandLogOption )
         env.Append( CPPDEFINES = { 'SENF_LOG_CONF': '$expandLogOption' } )
@@ -54,6 +54,6 @@ def SetupForSENF(env):
 
         env.Default(
             env.AlwaysBuild(
-                env.Command('senf/libsenf.a', [],  [ 'scons -C senf $SENF_BUILDOPTS libsenf.a' ])))
+                env.Command('senf/libsenf.a', [],  [ 'scons -C %s $SENF_BUILDOPTS libsenf.a' % os.path.realpath('senf')])))
     else:
         print '\nUsing global SENF\n'