From d4a334341e6b14fa4a4fcc781406d3fdab599e52 Mon Sep 17 00:00:00 2001
From: Lucio Asnaghi <kunitoki@gmail.com>
Date: Thu, 17 Jun 2010 10:38:23 +0000
Subject: [PATCH] - fixed OGR input plugin problem when using boost mapped_file
 (needs linkage to libboost_iostreams.so) - cosmetics

---
 plugins/input/ogr/SConscript         | 16 ++++++++--------
 plugins/input/ogr/ogr_datasource.cpp |  3 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/plugins/input/ogr/SConscript b/plugins/input/ogr/SConscript
index 83bc7cbda..12f44867c 100644
--- a/plugins/input/ogr/SConscript
+++ b/plugins/input/ogr/SConscript
@@ -19,6 +19,7 @@
 #
 # $Id$
 
+
 Import ('env')
 
 prefix = env['PREFIX']
@@ -26,22 +27,21 @@ install_prefix = env['DESTDIR'] + '/' + prefix
 
 ogr_src = Split(
 	"""
-	ogr_converter.cpp
-	ogr_datasource.cpp
-	ogr_featureset.cpp      
-	ogr_index_featureset.cpp
+	    ogr_converter.cpp
+	    ogr_datasource.cpp
+	    ogr_featureset.cpp      
+	    ogr_index_featureset.cpp
 	"""
         )
 
 libraries = [env['PLUGINS']['ogr']['lib']]
+libraries = ['boost_iostreams%s' % env['BOOST_APPEND']]   
 
 if env['PLATFORM'] == 'Darwin':
-    if env['HAS_BOOST_SYSTEM']:
-        boost_system = 'boost_system%s' % env['BOOST_APPEND']
-        libraries.append(boost_system)
     libraries.append('mapnik2')
     libraries.append(env['ICU_LIB_NAME'])
-    libraries.append('boost_iostreams%s' % env['BOOST_APPEND'])
+    libraries.append('boost_system%s' % env['BOOST_APPEND'])
+    libraries.append('boost_filesystem%s' % env['BOOST_APPEND'])
 
 ogr_inputdriver = env.SharedLibrary('ogr', source=ogr_src, SHLIBPREFIX='', SHLIBSUFFIX='.input', LIBS=libraries)
 
diff --git a/plugins/input/ogr/ogr_datasource.cpp b/plugins/input/ogr/ogr_datasource.cpp
index 425795546..a7e83e1ad 100644
--- a/plugins/input/ogr/ogr_datasource.cpp
+++ b/plugins/input/ogr/ogr_datasource.cpp
@@ -80,8 +80,7 @@ ogr_datasource::ogr_datasource(parameters const& params)
    if (!dataset_) 
    {
       std::string err = CPLGetLastErrorMsg();
-      if( err.size() == 0 )
-      {
+      if( err.size() == 0 ) {
          throw datasource_exception("Connection failed: " + dataset_name_ + " was not found or is not a supported format");
       } else {
          throw datasource_exception(err);