now senf could also be located in ../senf

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1306 270642c3-0616-0410-b53a-bc976706d245

diff --git a/senfscons/senfutil.py b/senfscons/senfutil.py
index a2b1ce8..4aae4da 100644 (file)
--- a/senfscons/senfutil.py
+++ b/senfscons/senfutil.py
@@ -67,5 +67,17 @@ def SetupForSENF(env):
         #env.Default(
         #    env.AlwaysBuild(
         #        env.Command('senf/libsenf.a', [],  [ 'scons -C %s $SENF_BUILDOPTS libsenf.a' % os.path.realpath('senf')])))
+    elif os.path.exists('../senf'):
+        print "\nUsing SENF in '../senf'\n"
+        env.Append( LIBPATH = [ '../senf' ],
+                    CPPPATH = [ '../senf/include' ],
+                    SENF_BUILDOPTS = [ '${final and "final=1" or None}',
+                                       '${debug and "debug=1" or None}',
+                                       '${profile and "profile=1" or None}' ],
+                    CPPDEFINES = [ '${not(final) and "SENF_DEBUG" or None}' ] )
+
+        #env.Default(
+        #    env.AlwaysBuild(
+        #        env.Command('senf/libsenf.a', [],  [ 'scons -C %s $SENF_BUILDOPTS libsenf.a' % os.path.realpath('senf')])))
     else:
         print '\nUsing global SENF\n'