Add $CONFIGURELOG and $CONFIGUREDIR values to support specification of the configuration log file and directory for configuration tests.

3 files changed, 32 insertions, 6 deletions

diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index 5c9d5e7..4fe8987 100644
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -345,6 +345,8 @@ class Variable_Method_Caller:
 ConstructionEnvironment = {
     'BUILDERS'      : {},
     'SCANNERS'      : [],
+    'CONFIGUREDIR'  : '#/.sconf_temp',
+    'CONFIGURELOG'  : '#/config.log',
     'CPPSUFFIXES'   : SCons.Tool.CSuffixes,
     'DSUFFIXES'     : SCons.Tool.DSuffixes,
     'IDLSUFFIXES'   : SCons.Tool.IDLSuffixes,
diff --git a/src/engine/SCons/Defaults.xml b/src/engine/SCons/Defaults.xml
index 71f2f21..56957aa 100644
--- a/src/engine/SCons/Defaults.xml
+++ b/src/engine/SCons/Defaults.xml
@@ -84,6 +84,31 @@ env['_CPPINCFLAGS'] = '$( ${_concat(INCPREFIX, CPPPATH, INCSUFFIX, __env__, RDir
 </summary>
 </cvar>
 
+<cvar name="CONFIGUREDIR">
+<summary>
+The name of the directory in which
+Configure context test files are written.
+The default is
+<filename>.sconf_temp</filename>
+in the top-level directory
+containing the
+<filename>SConstruct</filename>
+file.
+</summary>
+</cvar>
+
+<cvar name="CONFIGURELOG">
+<summary>
+The name of the Configure context log file.
+The default is
+<filename>config.log</filename>
+in the top-level directory
+containing the
+<filename>SConstruct</filename>
+file.
+</summary>
+</cvar>
+
 <cvar name="CPPDEFINES">
 <summary>
 A platform independent specification of C preprocessor definitions.
diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 703619b..74fd5fa 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -329,8 +329,8 @@ class SConf:
     SConf run, we need to explicitely cache this error.
     """
 
-    def __init__(self, env, custom_tests = {}, conf_dir='#/.sconf_temp',
-                 log_file='#/config.log', config_h = None, _depth = 0): 
+    def __init__(self, env, custom_tests = {}, conf_dir='$CONFIGUREDIR',
+                 log_file='$CONFIGURELOG', config_h = None, _depth = 0): 
         """Constructor. Pass additional tests in the custom_tests-dictinary,
         e.g. custom_tests={'CheckPrivate':MyPrivateTest}, where MyPrivateTest
         defines a custom test.
@@ -346,9 +346,8 @@ class SConf:
                    "Only one SConf object may be active at one time")
         self.env = env
         if log_file != None:
-            self.logfile = SConfFS.File(log_file)
-        else:
-            self.logfile = None
+            log_file = SConfFS.File(env.subst(log_file))
+        self.logfile = log_file
         self.logstream = None
         self.lastTarget = None
         self.depth = _depth
@@ -366,7 +365,7 @@ class SConf:
                }
         self.AddTests(default_tests)
         self.AddTests(custom_tests)
-        self.confdir = SConfFS.Dir(conf_dir)
+        self.confdir = SConfFS.Dir(env.subst(conf_dir))
         self.calc = None
         if not config_h is None:
             config_h = SConfFS.File(config_h)