summaryrefslogtreecommitdiff
path: root/engine/SCons/SConf.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-16 05:58:16 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-16 05:58:16 +0100
commit60df8165e6be58369d76af4d38388c9846d82975 (patch)
tree827a72e604ad686e6817a40ff0dcaef405212276 /engine/SCons/SConf.py
parent9948951ec4fcd3c29d7d7ba981de1d1fea275595 (diff)
parent6a570afd28bccdb118edde36488ba9834494d6c7 (diff)
Merge tag 'upstream/2.4.1'
Upstream version 2.4.1
Diffstat (limited to 'engine/SCons/SConf.py')
-rw-r--r--engine/SCons/SConf.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/engine/SCons/SConf.py b/engine/SCons/SConf.py
index 2ef4003..5a15856 100644
--- a/engine/SCons/SConf.py
+++ b/engine/SCons/SConf.py
@@ -34,7 +34,7 @@ libraries are installed, if some command line options are supported etc.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/SConf.py rel_2.4.0:3365:9259ea1c13d7 2015/09/21 14:03:43 bdbaddog"
+__revision__ = "src/engine/SCons/SConf.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
import SCons.compat
@@ -444,6 +444,7 @@ class SConfBase(object):
'CheckCXXHeader' : CheckCXXHeader,
'CheckLib' : CheckLib,
'CheckLibWithHeader' : CheckLibWithHeader,
+ 'CheckProg' : CheckProg,
}
self.AddTests(default_tests)
self.AddTests(custom_tests)
@@ -1047,6 +1048,14 @@ def CheckLibWithHeader(context, libs, header, language,
context.did_show_result = 1
return not res
+def CheckProg(context, prog_name):
+ """Simple check if a program exists in the path. Returns the path
+ for the application, or None if not found.
+ """
+ res = SCons.Conftest.CheckProg(context, prog_name)
+ context.did_show_result = 1
+ return res
+
# Local Variables:
# tab-width:4
# indent-tabs-mode:nil