From b2e9fffc3dce95b6dffb9b01aa4527aed5cffa4f Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Thu, 10 Jul 2014 03:53:37 +0600
Subject: [PATCH] Further tweaks to SCons's auto tests

We should do autotests only after setting path to sconsign,
otherwise using the same working directory and different
build directories will eventually break.
---
 SConstruct | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/SConstruct b/SConstruct
index bcc1a4ba4ec..8e310c68c90 100644
--- a/SConstruct
+++ b/SConstruct
@@ -595,16 +595,6 @@ if not os.path.isdir ( B.root_build_dir):
 # if not os.path.isdir(B.doc_build_dir) and env['WITH_BF_DOCS']:
 #     os.makedirs ( B.doc_build_dir )
 
-# Put all auto configuration run-time tests here
-
-from FindSharedPtr import FindSharedPtr
-from FindUnorderedMap import FindUnorderedMap
-
-conf = Configure(env)
-conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
-FindSharedPtr(conf)
-FindUnorderedMap(conf)
-env = conf.Finish()
 
 ###################################
 # Ensure all data files are valid #
@@ -787,6 +777,19 @@ B.init_lib_dict()
 
 ##### END SETUP ##########
 
+# Put all auto configuration run-time tests here
+
+from FindSharedPtr import FindSharedPtr
+from FindUnorderedMap import FindUnorderedMap
+
+conf = Configure(env)
+conf.env.Append(LINKFLAGS=env['PLATFORM_LINKFLAGS'])
+FindSharedPtr(conf)
+FindUnorderedMap(conf)
+env = conf.Finish()
+
+# End of auto configuration
+
 Export('env')
 
 VariantDir(B.root_build_dir+'/source', 'source', duplicate=0)