From 5b167b4fa2c5f7cc80f475d559a8852a552d8f82 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Sun, 8 Jan 2012 17:13:19 -0800
Subject: [PATCH] scons: pass boost version through env

---
 SConstruct | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index cae93d64b..d9a237de9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -424,7 +424,8 @@ pickle_store = [# Scons internal variables
         'CAIROMM_LINKFLAGS',
         'CAIROMM_CPPPATHS',
         'SVG_RENDERER',
-        'SQLITE_LINKFLAGS'
+        'SQLITE_LINKFLAGS',
+        'BOOST_LIB_VERSION_FROM_HEADER'
         ]
 
 # Add all other user configurable options to pickle pickle_store
@@ -1115,10 +1116,7 @@ if not preconfigured:
         
     conf.FindBoost(BOOST_SEARCH_PREFIXES,thread_flag)
     
-    boost_lib_version_from_header = conf.GetBoostLibVersion()
-    if boost_lib_version_from_header:
-        boost_version_from_header = int(boost_lib_version_from_header.split('_')[1])
-            
+    env['BOOST_LIB_VERSION_FROM_HEADER'] = conf.GetBoostLibVersion()
     
     # The other required boost headers.
     BOOST_LIBSHEADERS = [
@@ -1432,8 +1430,9 @@ if not preconfigured:
                 env.Append(CXXFLAGS = gcc_cxx_flags + '-O0 -fno-inline %s' % debug_flags)
             else: 
                 env.Append(CXXFLAGS = gcc_cxx_flags + '-O%s -finline-functions -Wno-inline -Wno-parentheses -Wno-char-subscripts %s' % (env['OPTIMIZATION'],ndebug_flags))
+
             if env['DEBUG_UNDEFINED']:
-                env.Append(CXXFLAGS = '-fcatch-undefined-behavior') #-ftrapv -fwrapv 
+                env.Append(CXXFLAGS = '-fcatch-undefined-behavior') #-ftrapv -fwrapv
 
         if 'python' in env['BINDINGS']:
             if not os.access(env['PYTHON'], os.X_OK):