From 74188064506a49838812f1d192e71927c184727d Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 3 Mar 2009 19:44:36 +0000
Subject: [PATCH] scons: explicitly link against libmapnik for command line
 programs to be built

---
 demo/c++/SConscript           |  3 +--
 utils/pgsql2sqlite/Jamroot    | 11 ++++++-----
 utils/pgsql2sqlite/SConscript |  3 +--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/demo/c++/SConscript b/demo/c++/SConscript
index c502c67ab..238812ed2 100644
--- a/demo/c++/SConscript
+++ b/demo/c++/SConscript
@@ -34,13 +34,12 @@ headers = env['CPPPATH']
 
 boost_thread  = 'boost_thread%s' % env['BOOST_APPEND']
 
-libraries =  [boost_thread]
+libraries =  [boost_thread,'mapnik']
 
 if env['CAIRO']:
     libraries.append('cairo')
 
 if env['PLATFORM'] == 'Darwin':
-    libraries.append('mapnik')
     libraries.append('icuuc')
     libraries.append('icudata')
    
diff --git a/utils/pgsql2sqlite/Jamroot b/utils/pgsql2sqlite/Jamroot
index ce235cdde..128fa2e0e 100644
--- a/utils/pgsql2sqlite/Jamroot
+++ b/utils/pgsql2sqlite/Jamroot
@@ -1,7 +1,7 @@
 #
 
-lib program_options : : <name>boost_program_options-xgcc40-mt <search>/usr/local/lib ;
-lib pq : : <name>pq <search>/opt/postgresql/lib ;
+lib program_options : : <name>boost_program_options-mt <search>/opt/local/lib ;
+lib pq : : <name>pq <search>/usr/local/pgsql/lib ;
 lib sqlite : : <name>sqlite3 <search>/usr/local/lib ;
 
 exe pgsql2sqlite :
@@ -13,9 +13,10 @@ exe pgsql2sqlite :
     .//pq
     .//sqlite
     :
-    <include>/usr/local/include/boost-1_38
-    <include>/opt/mapnik/include
+    <include>/usr/local/include/mapnik
+    <include>/opt/local/include
+    <include>/usr/local/pgsql/include/
+    <include>/opt/local/include/boost-1_35
     <include>../../plugins/input/postgis
-    <include>/opt/postgresql/include
     #<define>MAPNIK_DEBUG
     ;
diff --git a/utils/pgsql2sqlite/SConscript b/utils/pgsql2sqlite/SConscript
index 27ee4ccf2..f25a24158 100644
--- a/utils/pgsql2sqlite/SConscript
+++ b/utils/pgsql2sqlite/SConscript
@@ -36,10 +36,9 @@ headers = ['#plugins/input/postgis'] + env['CPPPATH']
 boost_program_options = 'boost_program_options%s' % env['BOOST_APPEND']
 boost_thread  = 'boost_thread%s' % env['BOOST_APPEND']
 
-libraries =  [boost_program_options,boost_thread,'sqlite3','pq']
+libraries =  [boost_program_options,boost_thread,'sqlite3','pq','mapnik']
 
 if env['PLATFORM'] == 'Darwin':
-    libraries.append('mapnik')
     libraries.append('icuuc')
     libraries.append('icudata')