From 18b750d86b516482c7010d2dcd0e51c2eedb4f9f Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 7 Nov 2008 01:54:39 +0100
Subject: [PATCH] SCons: set LUMIERA_PLUGIN_PATH, add option PKGLIBDIR

---
 SConstruct       | 5 +++++
 tests/SConscript | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/SConstruct b/SConstruct
index 40fba1845..26efb00e8 100644
--- a/SConstruct
+++ b/SConstruct
@@ -84,6 +84,10 @@ def setupBasicEnvironment():
     appendVal(env,'OPTIMIZE', 'CCFLAGS',   val=' -O3')
     appendVal(env,'DEBUG',    'CCFLAGS',   val=' -ggdb')
     
+    # setup search path for Lumiera plugins
+    appendCppDefine(env,'PKGLIBDIR','LUMIERA_PLUGIN_PATH=\\"$PKGLIBDIR\\"'
+                                   ,'LUMIERA_PLUGIN_PATH=\\"$DESTDIR/lib/lumiera\\"') 
+    
     prepareOptionsHelp(opts,env)
     opts.Save(OPTIONSCACHEFILE, env)
     return env
@@ -144,6 +148,7 @@ def defineCmdlineOptions():
 #       ,EnumOption('DIST_TARGET', 'Build target architecture', 'auto', 
 #                   allowed_values=('auto', 'i386', 'i686', 'x86_64' ), ignorecase=2)
         ,PathOption('DESTDIR', 'Installation dir prefix', '/usr/local')
+        ,PathOption('PKGLIBDIR', 'Installation dir for plugins, defaults to DESTDIR/lib/lumiera', '',PathOption.PathAccept)
         ,PathOption('SRCTAR', 'Create source tarball prior to compiling', '..', PathOption.PathAccept)
         ,PathOption('DOCTAR', 'Create tarball with dev documentaionl', '..', PathOption.PathAccept)
      )
diff --git a/tests/SConscript b/tests/SConscript
index 901c2280c..fe378b891 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -48,14 +48,13 @@ def treatPluginTestcase(env):
     """
     tree = 'backend'
     env = env.Clone()
-    env.Append(CPPPATH=tree)
+    env.Append(CPPPATH=tree, CPPDEFINES='LUMIERA_PLUGIN')
     prfx = path.join(tree,'example_plugin')
     oC   = env.SharedObject(prfx,        prfx+'.c')
     oCPP = env.SharedObject(prfx+'_cpp', prfx+'.cpp')
-    testplugin = ( env.LoadableModule('#$BINDIR/.libs/examplepluginc',      oC, SHLIBPREFIX='')
-
+    testplugin = ( env.LoadableModule('#$BINDIR/.libs/examplepluginc',    oC, SHLIBPREFIX='')
+#                + env.SharedLibrary('#$BINDIR/.libs/exampleplugincpp', oCPP, SHLIBPREFIX='')
 # doesn't compile yet...
-#                 + env.SharedLibrary('#$BINDIR/.libs/exampleplugincpp', oCPP, SHLIBPREFIX='')
                  )
     
     return testplugin