From 2cae8d8ccc67a4df2e050ebe6cc911b238c478d2 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 1 Feb 2009 19:56:49 +0100
Subject: [PATCH 1/2] fix to circumvent a problem with Iconinfo::operator
 bool() not being const

seemingly this has been fixed in recent gtkmm, but is still present on lenny (and etch)
---
 src/gui/window-manager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp
index 04f9ffdc9..0e6319816 100644
--- a/src/gui/window-manager.cpp
+++ b/src/gui/window-manager.cpp
@@ -236,7 +236,9 @@ WindowManager::add_theme_icon_source(Gtk::IconSet &icon_set,
   // Try to load the icon
   RefPtr<Gtk::IconTheme> theme = Gtk::IconTheme::get_default();
   REQUIRE(theme);
-  const IconInfo info = theme->lookup_icon(icon_name, width,
+  
+  TODO ("find out how IconInfo could be made const. For example, GTKmm 2.10.10 is missing the const on operator bool() in iconinfo.h");
+  IconInfo info = theme->lookup_icon(icon_name, width,
     (IconLookupFlags)0);
   if(info)
     {

From ec2f362c3acd6456b330442a19204805d5a80a4d Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 1 Feb 2009 20:43:23 +0100
Subject: [PATCH 2/2] During alpha: build .libs into the LUMIERA_PLUGIN_PATH to
 ease developent

---
 SConstruct             | 8 ++++----
 src/common/Makefile.am | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index 7a1aa2592..3c49573da 100644
--- a/SConstruct
+++ b/SConstruct
@@ -93,10 +93,10 @@ def setupBasicEnvironment():
     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\\"') 
-    appendCppDefine(env,'PKGDATADIR','LUMIERA_CONFIG_PATH=\\"$PKGLIBDIR\\"'
-                                    ,'LUMIERA_CONFIG_PATH=\\"$DESTDIR/share/lumiera\\"') 
+    appendCppDefine(env,'PKGLIBDIR','LUMIERA_PLUGIN_PATH=\\"$PKGLIBDIR/:./.libs\\"'
+                                   ,'LUMIERA_PLUGIN_PATH=\\"$DESTDIR/lib/lumiera/:./.libs\\"') 
+    appendCppDefine(env,'PKGDATADIR','LUMIERA_CONFIG_PATH=\\"$PKGLIBDIR/:.\\"'
+                                    ,'LUMIERA_CONFIG_PATH=\\"$DESTDIR/share/lumiera/:.\\"') 
     
     prepareOptionsHelp(opts,env)
     opts.Save(OPTIONSCACHEFILE, env)
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 661c92f64..451b0a982 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -18,7 +18,7 @@
 liblumieracommon_la_srcdir = $(top_srcdir)/src/common
 lib_LTLIBRARIES += liblumieracommon.la
 
-liblumieracommon_la_CPPFLAGS = $(AM_CPPFLAGS)  -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\"" -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)/\""
+liblumieracommon_la_CPPFLAGS = $(AM_CPPFLAGS)  -DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config:.\"" -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)/:./.libs\""
 liblumieracommon_la_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wextra -Wall -Werror
 liblumieracommon_la_CXXFLAGS = $(AM_CXXFLAGS) -Wextra -Wall
 liblumieracommon_la_LIBADD = liblumiera.la