Merged fixes from Richard Quirk

3 files changed, 4 insertions, 2 deletions

diff --git a/src/engine/SCons/Action.py b/src/engine/SCons/Action.py
index 6909a9ac..c1eef756 100644
--- a/src/engine/SCons/Action.py
+++ b/src/engine/SCons/Action.py
@@ -899,7 +899,7 @@ class CommandGeneratorAction(ActionBase):
                  show=_null, execute=_null, chdir=_null, executor=None):
         act = self._generate(target, source, env, 0, executor)
         if act is None:
-            raise UserError("While building `%s': "
+            raise SCons.Errors.UserError("While building `%s': "
                             "Cannot deduce file extension from source files: %s"
                 % (repr(list(map(str, target))), repr(list(map(str, source)))))
         return act(target, source, env, exitstatfunc, presub,
diff --git a/src/engine/SCons/Conftest.py b/src/engine/SCons/Conftest.py
index 04a6bc2a..d4662780 100644
--- a/src/engine/SCons/Conftest.py
+++ b/src/engine/SCons/Conftest.py
@@ -554,7 +554,7 @@ def CheckDeclaration(context, symbol, includes = None, language = None):
 
     lang, suffix, msg = _lang2suffix(language)
     if msg:
-        context.Display("Cannot check for declaration %s: %s\n" % (type_name, msg))
+        context.Display("Cannot check for declaration %s: %s\n" % (symbol, msg))
         return msg
 
     src = includetext + includes 
diff --git a/src/engine/SCons/SConfTests.py b/src/engine/SCons/SConfTests.py
index b05c4cc8..e6048860 100644
--- a/src/engine/SCons/SConfTests.py
+++ b/src/engine/SCons/SConfTests.py
@@ -697,6 +697,8 @@ int main() {
             assert r, "__cplusplus not declared in C++ ??"
             r = sconf.CheckDeclaration('__cplusplus', language = 'C')
             assert not r, "__cplusplus declared  in C ??"
+            r = sconf.CheckDeclaration('unknown', language = 'Unknown')
+            assert not r, "unknown language was supported ??"
         finally:
             sconf.Finish()