From feb3f3327c26aa5fdd57ebbdf227299150b97c34 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 24 Feb 2009 18:05:22 +0000
Subject: [PATCH] scons:reformat the custom boost and mapnik version checking
 cpp snippets, since on gcc 4.1.1 the existing formatting was causing 'no
 newline at end of file' warnings

---
 SConstruct | 55 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/SConstruct b/SConstruct
index afb6b72ab..4dadea292 100644
--- a/SConstruct
+++ b/SConstruct
@@ -296,13 +296,15 @@ def CheckBoost(context, version, silent=False):
     if not silent:
         context.Message('Checking for Boost version >= %s... ' % (version))
     ret = context.TryRun("""
-    #include <boost/version.hpp>
 
-    int main() 
-    {
-        return BOOST_VERSION >= %d ? 0 : 1;
-    }
-    """ % version_n, '.cpp')[0]
+#include <boost/version.hpp>
+
+int main() 
+{
+    return BOOST_VERSION >= %d ? 0 : 1;
+}
+
+""" % version_n, '.cpp')[0]
     if silent:
         context.did_show_result=1
     context.Result(ret)
@@ -310,15 +312,18 @@ def CheckBoost(context, version, silent=False):
 
 def GetBoostLibVersion(context):
     ret = context.TryRun("""
-    #include <boost/version.hpp>
-    #include <iostream>
-    
-    int main() 
-    {
-        std::cout << BOOST_LIB_VERSION << std::endl;
-        return 0;
-    }
-    """, '.cpp')
+
+#include <boost/version.hpp>
+#include <iostream>
+
+int main() 
+{
+
+std::cout << BOOST_LIB_VERSION << std::endl;
+return 0;
+}
+
+""", '.cpp')
     # hack to avoid printed output
     context.did_show_result=1
     context.Result(ret[0])
@@ -326,15 +331,17 @@ def GetBoostLibVersion(context):
 
 def GetMapnikLibVersion(context):
     ret = context.TryRun("""
-    #include <mapnik/version.hpp>
-    #include <iostream>
-    
-    int main() 
-    {
-        std::cout << MAPNIK_VERSION << std::endl;
-        return 0;
-    }
-    """, '.cpp')
+
+#include <mapnik/version.hpp>
+#include <iostream>
+
+int main() 
+{
+    std::cout << MAPNIK_VERSION << std::endl;
+    return 0;
+}
+
+""", '.cpp')
     # hack to avoid printed output
     context.did_show_result=1
     context.Result(ret[0])