From 901223ef250b45d419c7ea93ed7f9f899968e661 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 17 Feb 2009 22:48:17 +0000
Subject: [PATCH] scons: move the mapnik version checking later in script,
 after local paths have been added

---
 SConstruct | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/SConstruct b/SConstruct
index 7f2c0e13e..a906fac22 100644
--- a/SConstruct
+++ b/SConstruct
@@ -340,16 +340,6 @@ conf = Configure(env, custom_tests = { 'CheckPKGConfig' : CheckPKGConfig,
                                        'GetBoostLibVersion' : GetBoostLibVersion,
                                        'GetMapnikLibVersion' : GetMapnikLibVersion })
 
-
-# fetch the mapnik version header in order to set the
-# ABI version used to build libmapnik.so on linux in src/SConscript
-abi = conf.GetMapnikLibVersion()
-abi_fallback = [0,6,0]
-if not abi:
-    color_print(1,'Problem encountered parsing mapnik version (please post bug report to trac.mapnik.org), falling back to %s')
-    env['ABI_VERSION'] = abi_fallback
-else:
-    env['ABI_VERSION'] = abi
     
 #### Libraries and headers dependency checks ####
 
@@ -390,6 +380,17 @@ else:
 for required in ('BOOST', 'PNG', 'JPEG', 'TIFF','PROJ'):
     add_paths(required)
 
+
+# fetch the mapnik version header in order to set the
+# ABI version used to build libmapnik.so on linux in src/SConscript
+abi = conf.GetMapnikLibVersion()
+abi_fallback = [0,6,0]
+if not abi:
+    color_print(1,'Problem encountered parsing mapnik version (please post bug report to trac.mapnik.org), falling back to %s' % abi_fallback)
+    env['ABI_VERSION'] = abi_fallback
+else:
+    env['ABI_VERSION'] = abi
+
 requested_plugins = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])]
 
 # Adding the required prerequisite library directories for the plugins...