From 72d8407c28fc02cb986fa561c793e1b202e53867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carn=C3=AB=20Draug?= <carandraug+dev@gmail.com>
Date: Sat, 26 Sep 2015 19:01:04 +0100
Subject: Add new CheckProg configure method to documentation and list of
 changes.

---
 doc/scons.mod      |  1 +
 doc/user/sconf.xml | 20 ++++++++++++++++++++
 src/CHANGES.txt    |  4 ++++
 3 files changed, 25 insertions(+)

diff --git a/doc/scons.mod b/doc/scons.mod
index 72dc7ff..8d64054 100644
--- a/doc/scons.mod
+++ b/doc/scons.mod
@@ -276,6 +276,7 @@
 <!ENTITY CheckHeader "<function xmlns='http://www.scons.org/dbxsd/v1.0'>CheckHeader</function>">
 <!ENTITY CheckLib "<function xmlns='http://www.scons.org/dbxsd/v1.0'>CheckLib</function>">
 <!ENTITY CheckLibWithHeader "<function xmlns='http://www.scons.org/dbxsd/v1.0'>CheckLibWithHeader</function>">
+<!ENTITY CheckProg "<function xmlns='http://www.scons.org/dbxsd/v1.0'>CheckProg</function>">
 <!ENTITY CheckType "<function xmlns='http://www.scons.org/dbxsd/v1.0'>CheckType</function>">
 <!ENTITY CheckTypeSize "<function xmlns='http://www.scons.org/dbxsd/v1.0'>CheckTypeSize</function>">
 <!ENTITY TryAction "<function xmlns='http://www.scons.org/dbxsd/v1.0'>TryAction</function>">
diff --git a/doc/user/sconf.xml b/doc/user/sconf.xml
index 569ab1a..fe933f1 100644
--- a/doc/user/sconf.xml
+++ b/doc/user/sconf.xml
@@ -304,6 +304,26 @@ scons: `.' is up to date.
   </section>
 
   <section>
+  <title>Checking for the Presence of a program</title>
+
+    <para>
+
+    Check for the presence of a program
+    by using the &CheckProg; method:
+
+    </para>
+
+    <sconstruct>
+env = Environment()
+conf = Configure(env)
+if not conf.CheckProg('foobar'):
+  print 'Unable to find the program foobar on the system'
+  Exit(1)
+env = conf.Finish()
+    </sconstruct>
+
+  </section>
+  <section>
   <title>Adding Your Own Custom Checks</title>
 
     <para>
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 977d00f..3869621 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -13,6 +13,10 @@ RELEASE  VERSION/DATE TO BE FILLED IN LATER
     - Memoizer counting uses decorators now, instead of
       the old metaclasses approach.
 
+  From Carnë Draug:
+    - Added new configure check, CheckProg, to check for
+      existence of a program.
+
 RELEASE 2.3.6 - Mon, 31 Jul 2015 14:35:03 -0700
 
   From Rob Smith:
-- 
cgit v0.12