From c22ab63dc9c068bb3ad97697f179bd6faeb93630 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Wed, 2 Dec 2009 22:13:48 +0000
Subject: [PATCH] FAST and JOBS Scons options never worked because they need to
 be applied to the build step not configure - thanks timlinux for catching

---
 SConstruct | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/SConstruct b/SConstruct
index 129d51481..36b680c7e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -568,22 +568,6 @@ if not preconfigured:
     env['LIBDIR_SCHEMA'] = LIBDIR_SCHEMA
     env['PLUGINS'] = PLUGINS
     
-    if env['FAST']:
-        # caching is 'auto' by default in SCons
-        # But let's also cache implicit deps...
-        EnsureSConsVersion(0,98)
-        SetOption('implicit_cache', 1)
-        env.Decider('MD5-timestamp')
-        SetOption('max_drift', 1)
-        
-    else:
-        # Set the cache mode to 'force' unless requested, avoiding hidden caching of Scons 'opts' in '.sconsign.dblite'
-        # This allows for a SCONS_LOCAL_CONFIG, if present, to be used as the primary means of storing paths to successful build dependencies
-        SetCacheMode('force')
-    
-    if env['JOBS'] > 1:
-        SetOption("num_jobs", env['JOBS'])  
-    
     if env['PKG_CONFIG_PATH']:
         env['ENV']['PKG_CONFIG_PATH'] = env['PKG_CONFIG_PATH']
         # otherwise this variable == os.environ["PKG_CONFIG_PATH"]
@@ -959,6 +943,23 @@ Help(opts.GenerateHelpText(env))
 # export env so it is available in Sconscript files
 Export('env')
 
+
+if env['FAST']:
+    # caching is 'auto' by default in SCons
+    # But let's also cache implicit deps...
+    EnsureSConsVersion(0,98)
+    SetOption('implicit_cache', 1)
+    env.Decider('MD5-timestamp')
+    SetOption('max_drift', 1)
+    
+else:
+    # Set the cache mode to 'force' unless requested, avoiding hidden caching of Scons 'opts' in '.sconsign.dblite'
+    # This allows for a SCONS_LOCAL_CONFIG, if present, to be used as the primary means of storing paths to successful build dependencies
+    SetCacheMode('force')
+
+if env['JOBS'] > 1:
+    SetOption("num_jobs", env['JOBS'])  
+    
 # Build agg first, doesn't need anything special
 if env['INTERNAL_LIBAGG']:
     SConscript('agg/SConscript')