From d7d9e98352d4fb6d385edbd31b0354a424fe0418 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Sun, 29 Jun 2014 20:26:59 +0600
Subject: Fix compilation error on OSX+Scons

Issue was caused by OSX tweaks happening in the SConstruct
after the old location of autotest.
---
 SConstruct | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index bdb9b3a8bfb..134970dfdc3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -178,16 +178,6 @@ if crossbuild and platform not in ('win32-vc', 'win64-vc'):
 
 env['OURPLATFORM'] = platform
 
-# Put all auto configuration run-time tests here
-
-from FindSharedPtr import FindSharedPtr
-from FindUnorderedMap import FindUnorderedMap
-
-conf = Configure(env)
-FindSharedPtr(conf)
-FindUnorderedMap(conf)
-env = conf.Finish()
-
 configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
 
 if os.path.exists(configfile):
@@ -605,6 +595,16 @@ 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)
+FindSharedPtr(conf)
+FindUnorderedMap(conf)
+env = conf.Finish()
+
 ###################################
 # Ensure all data files are valid #
 ###################################
-- 
cgit v1.2.3