3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1911d5d..47bfba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-02-08  Ben Elliston  <bje@wasabisystems.com>
 
+	* runtest: Terminate with an error if expect cannot be found.
+	* TODO: Update.
+
+2004-02-08  Ben Elliston  <bje@wasabisystems.com>
+
 	* configure.ac: Use AC_PATH_PROG to find expect(1).
 	(DJ_AC_PATH_TCLSH): Remove unneeded invocation.
 	* acinclude.m4 (DJ_AC_PATH_TCLSH): Remove.
diff --git a/TODO b/TODO
index 2077d6c..e37f495 100644
--- a/TODO
+++ b/TODO
@@ -12,7 +12,6 @@ Configure/build
 ===============
 
 * Add a configure test to make sure the right version of Tcl is installed.
-* Add better error message to runtest when expect can't be found.
 
 Documentation
 =============
diff --git a/runtest b/runtest
index 5ce6abb..417e4f9 100755
--- a/runtest
+++ b/runtest
@@ -116,7 +116,12 @@ if [ x"$DEJAGNULIBS" != x ] ; then
     fi
 fi
 if [ x"$runpath" = x ] ; then
-    echo "ERROR: runtest.exp does not exist."
+    echo "ERROR: runtest.exp does not exist"
+    exit 1
+fi
+
+if ! type $expectbin >/dev/null 2>/dev/null ; then
+    echo "ERROR: unable to find expect on the PATH"
     exit 1
 fi