aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog16
-rw-r--r--Makefile.in4
-rw-r--r--TODO23
-rw-r--r--acinclude.m480
-rwxr-xr-xconfigure155
-rw-r--r--configure.ac9
-rw-r--r--doc/Makefile.in3
-rw-r--r--example/Makefile.in4
-rw-r--r--testsuite/Makefile.in4
-rw-r--r--testsuite/libdejagnu/Makefile.in4
10 files changed, 92 insertions, 210 deletions
diff --git a/ChangeLog b/ChangeLog
index 8af4e6a..1911d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
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.
+ (DJ_AC_STL): Likewise.
+ * configure: Regenerate.
+ * aclocal.m4: Likewise.
+ * configure: Likewise.
+ * Makefile.in: Likewise.
+ * doc/Makefile.in: Likewise.
+ * example/Makefile.in: Likewise.
+ * testsuite/Makefile.in: Likewise.
+ * testsuite/libdejagnu/Makefile.in: Likewise.
+ * TODO: Update.
+
+2004-02-08 Ben Elliston <bje@wasabisystems.com>
+
* runtest.1: Remove any mention of mondfe.
2004-02-08 Ben Elliston <bje@wasabisystems.com>
diff --git a/Makefile.in b/Makefile.in
index ff42e50..bbcad3a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,7 +79,6 @@ ETAGS = etags
CTAGS = ctags
DEJATOOL = $(PACKAGE)
RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
-EXPECT = expect
RUNTEST = runtest
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -118,6 +117,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@
+EXPECT = @EXPECT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -141,7 +141,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-TCLSH = @TCLSH@
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
@@ -175,7 +174,6 @@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-tclsh = @tclsh@
AUTOMAKE_OPTIONS = dejagnu
SUBDIRS = doc testsuite example
EXTRA_DIST = ChangeLog.0 MAINTAINERS runtest site.tmpl \
diff --git a/TODO b/TODO
index b0a03a2..2077d6c 100644
--- a/TODO
+++ b/TODO
@@ -1,11 +1,20 @@
-Mon Aug 18 09:58:25 EST 2003
+Last updated Sun Feb 8 12:57:16 EST 2004
+
+Bigger items
+============
* Transfer timeouts should be dependent on file size and link speed.
-* Add more support for target boards and realtime OS's.
+* Add more support for target boards and RTOSes.
* Use the new expect terminal support for an "escape codes" API.
-* Use expectk and write a GUI testing API, complete with
- record/playback.
+* Use expectk and write a GUI testing API, complete with record/playback.
+
+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
+=============
+
* Add a "testing methodologies" section to the manual.
-* Add a configure test to make sure Tcl and expect are installed.
-* Add support to runtest to produce a better error message when expect
- can't be found.
diff --git a/acinclude.m4 b/acinclude.m4
index 621962c..80214e5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,82 +1,5 @@
-AC_DEFUN([DJ_AC_STL], [
-AC_MSG_CHECKING(for STL versions)
-AC_CACHE_VAL(ac_cv_stl,[
- AC_LANG_CPLUSPLUS
- AC_TRY_COMPILE([#include <iostream>], [
- using namespace std;
- char bbuuff[5120];
- cout.rdbuf()->pubsetbuf(bbuuff, 5120); ],
- ac_cv_stl=v3
- ,
- ac_cv_stl=v2
- ),
-])
-
-AC_LANG_C
-if test x"${ac_cv_stl}" != x"v2" ; then
- AC_MSG_RESULT(v3)
- AC_DEFINE(HAVE_STL3)
-else
- AC_MSG_RESULT(v2)
-fi
-])
-
-AC_DEFUN([DJ_AC_PATH_TCLSH], [
-dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
-../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../..
-/../../../../../.."
-no_itcl=true
-AC_MSG_CHECKING(for the tclsh program)
-AC_ARG_WITH(tclinclude, [ --with-tclinclude directory where tcl headers are], with_tclinclude=${withval})
-AC_CACHE_VAL(ac_cv_path_tclsh,[
-dnl first check to see if --with-itclinclude was specified
-if test x"${with_tclinclude}" != x ; then
- if test -f ${with_tclinclude}/tclsh ; then
- ac_cv_path_tclsh=`(cd ${with_tclinclude}; pwd)`
- elif test -f ${with_tclinclude}/src/tclsh ; then
- ac_cv_path_tclsh=`(cd ${with_tclinclude}/src; pwd)`
- else
- AC_MSG_ERROR([${with_tclinclude} directory doesn't contain tclsh])
- fi
-fi
-])
-
-dnl next check in private source directory
-dnl since ls returns lowest version numbers first, reverse its output
-if test x"${ac_cv_path_tclsh}" = x ; then
- dnl find the top level Itcl source directory
- for i in $dirlist; do
- if test -n "`ls -dr $srcdir/$i/tcl* 2>/dev/null`" ; then
- tclpath=$srcdir/$i
- break
- fi
- done
-
- dnl find the exact Itcl source dir. We do it this way, cause there
- dnl might be multiple version of Itcl, and we want the most recent one.
- for i in `ls -dr $tclpath/tcl* 2>/dev/null ` ; do
- if test -f $i/src/tclsh ; then
- ac_cv_path_tclsh=`(cd $i/src; pwd)`/tclsh
- break
- fi
- done
-fi
-
-dnl see if one is installed
-if test x"${ac_cv_path_tclsh}" = x ; then
- AC_MSG_RESULT(none)
- AC_PATH_PROG(tclsh, tclsh)
-else
- AC_MSG_RESULT(${ac_cv_path_tclsh})
-fi
-TCLSH="${ac_cv_path_tclsh}"
-AC_SUBST(TCLSH)
-])
-
-
AC_DEFUN([DJ_AC_PATH_DOCBOOK], [
-dirlist=".. ../../ ../../.. ../../../.. ../../../../.. ../../../../../.. ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
-AC_MSG_CHECKING(for docbook tools)
+AC_MSG_CHECKING(for Docbook tools)
AC_ARG_WITH(oskith, [ --with-docbook directory where the db2 sgml tools are], with_docbook=${withval})
AC_CACHE_VAL(ac_cv_c_docbook,[
dnl first check to see if --with-docbook was specified
@@ -107,4 +30,3 @@ fi
AC_SUBST(DOCBOOK)
])
-
diff --git a/configure b/configure
index 0da5b59..252f8ae 100755
--- a/configure
+++ b/configure
@@ -273,7 +273,7 @@ PACKAGE_BUGREPORT=
ac_unique_file="runtest.exp"
ac_subdirs_all="$ac_subdirs_all example/calc example/hello"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC DOCBOOK tclsh TCLSH BOARDS CONFIG subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE YACC EXPECT DOCBOOK BOARDS CONFIG subdirs LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -822,7 +822,6 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-docbook directory where the db2 sgml tools are
- --with-tclinclude directory where tcl headers are
Some influential environment variables:
CC C compiler command
@@ -3385,7 +3384,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
for ac_prog in 'bison -y' byacc
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3428,10 +3426,54 @@ done
test -n "$YACC" || YACC="yacc"
+# Extract the first word of "expect", so it can be a program name with args.
+set dummy expect; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_EXPECT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $EXPECT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_EXPECT="$EXPECT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_EXPECT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+EXPECT=$ac_cv_path_EXPECT
+
+if test -n "$EXPECT"; then
+ echo "$as_me:$LINENO: result: $EXPECT" >&5
+echo "${ECHO_T}$EXPECT" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+if test -z $ac_cv_path_EXPECT ; then
+ { { echo "$as_me:$LINENO: error: unable to locate expect" >&5
+echo "$as_me: error: unable to locate expect" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
-dirlist=".. ../../ ../../.. ../../../.. ../../../../.. ../../../../../.. ../../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../../../../../../../.."
-echo "$as_me:$LINENO: checking for docbook tools" >&5
-echo $ECHO_N "checking for docbook tools... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for Docbook tools" >&5
+echo $ECHO_N "checking for Docbook tools... $ECHO_C" >&6
# Check whether --with-oskith or --without-oskith was given.
if test "${with_oskith+set}" = set; then
@@ -3475,104 +3517,6 @@ fi
-
-dirlist=".. ../../ ../../../ ../../../../ ../../../../../ ../../../../../../ ../
-../../../../../.. ../../../../../../../.. ../../../../../../../../.. ../../../..
-/../../../../../.."
-no_itcl=true
-echo "$as_me:$LINENO: checking for the tclsh program" >&5
-echo $ECHO_N "checking for the tclsh program... $ECHO_C" >&6
-
-# Check whether --with-tclinclude or --without-tclinclude was given.
-if test "${with_tclinclude+set}" = set; then
- withval="$with_tclinclude"
- with_tclinclude=${withval}
-fi;
-if test "${ac_cv_path_tclsh+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test x"${with_tclinclude}" != x ; then
- if test -f ${with_tclinclude}/tclsh ; then
- ac_cv_path_tclsh=`(cd ${with_tclinclude}; pwd)`
- elif test -f ${with_tclinclude}/src/tclsh ; then
- ac_cv_path_tclsh=`(cd ${with_tclinclude}/src; pwd)`
- else
- { { echo "$as_me:$LINENO: error: ${with_tclinclude} directory doesn't contain tclsh" >&5
-echo "$as_me: error: ${with_tclinclude} directory doesn't contain tclsh" >&2;}
- { (exit 1); exit 1; }; }
- fi
-fi
-
-fi
-
-
-if test x"${ac_cv_path_tclsh}" = x ; then
- for i in $dirlist; do
- if test -n "`ls -dr $srcdir/$i/tcl* 2>/dev/null`" ; then
- tclpath=$srcdir/$i
- break
- fi
- done
-
- for i in `ls -dr $tclpath/tcl* 2>/dev/null ` ; do
- if test -f $i/src/tclsh ; then
- ac_cv_path_tclsh=`(cd $i/src; pwd)`/tclsh
- break
- fi
- done
-fi
-
-if test x"${ac_cv_path_tclsh}" = x ; then
- echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
- # Extract the first word of "tclsh", so it can be a program name with args.
-set dummy tclsh; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_tclsh+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $tclsh in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_tclsh="$tclsh" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_tclsh="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- ;;
-esac
-fi
-tclsh=$ac_cv_path_tclsh
-
-if test -n "$tclsh"; then
- echo "$as_me:$LINENO: result: $tclsh" >&5
-echo "${ECHO_T}$tclsh" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-else
- echo "$as_me:$LINENO: result: ${ac_cv_path_tclsh}" >&5
-echo "${ECHO_T}${ac_cv_path_tclsh}" >&6
-fi
-TCLSH="${ac_cv_path_tclsh}"
-
-
-
BOARDS='$(boards)'
CONFIG='$(config)'
@@ -4309,9 +4253,8 @@ s,@CXXDEPMODE@,$CXXDEPMODE,;t t
s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
s,@YACC@,$YACC,;t t
+s,@EXPECT@,$EXPECT,;t t
s,@DOCBOOK@,$DOCBOOK,;t t
-s,@tclsh@,$tclsh,;t t
-s,@TCLSH@,$TCLSH,;t t
s,@BOARDS@,$BOARDS,;t t
s,@CONFIG@,$CONFIG,;t t
s,@subdirs@,$subdirs,;t t
diff --git a/configure.ac b/configure.ac
index 6451fd6..c40dbcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,15 +10,16 @@ AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
AC_EXEEXT
-
AC_PROG_YACC
+AC_PATH_PROG(EXPECT, expect)
+if test -z $ac_cv_path_EXPECT ; then
+ AC_MSG_ERROR([unable to locate expect])
+fi
+
dnl we need the path to Docbook so we can build packages.
DJ_AC_PATH_DOCBOOK
-dnl we need the path to the tcl shell to build a release
-DJ_AC_PATH_TCLSH
-
dnl Level of indirection for automake macro (baseboards:boards_DATA)
BOARDS='$(boards)'
AC_SUBST(BOARDS)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 67dbea9..76e0260 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -87,6 +87,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@
+EXPECT = @EXPECT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -110,7 +111,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-TCLSH = @TCLSH@
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
@@ -144,7 +144,6 @@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-tclsh = @tclsh@
dist_man_MANS = runtest.1
info_TEXINFOS = dejagnu.texi
TARGETS = book1.html overview.ps overview.pdf
diff --git a/example/Makefile.in b/example/Makefile.in
index bd2385d..0949ece 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -54,7 +54,6 @@ ETAGS = etags
CTAGS = ctags
DEJATOOL = $(PACKAGE)
RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
-EXPECT = expect
RUNTEST = runtest
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -83,6 +82,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@
+EXPECT = @EXPECT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -106,7 +106,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-TCLSH = @TCLSH@
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
@@ -140,7 +139,6 @@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-tclsh = @tclsh@
AUTOMAKE_OPTIONS = dejagnu
SUBDIRS = calc hello
all: all-recursive
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index c5d6657..8422ef3 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -53,7 +53,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
ETAGS = etags
CTAGS = ctags
DEJATOOL = $(PACKAGE)
-EXPECT = expect
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -81,6 +80,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@
+EXPECT = @EXPECT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -104,7 +104,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-TCLSH = @TCLSH@
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
@@ -138,7 +137,6 @@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-tclsh = @tclsh@
AUTOMAKE_OPTIONS = dejagnu
SUBDIRS = libdejagnu
EXTRA_DIST = \
diff --git a/testsuite/libdejagnu/Makefile.in b/testsuite/libdejagnu/Makefile.in
index de21a15..870d67b 100644
--- a/testsuite/libdejagnu/Makefile.in
+++ b/testsuite/libdejagnu/Makefile.in
@@ -63,7 +63,6 @@ ETAGS = etags
CTAGS = ctags
DEJATOOL = $(PACKAGE)
RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir
-EXPECT = expect
RUNTEST = runtest
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
@@ -91,6 +90,7 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EXEEXT = @EXEEXT@
+EXPECT = @EXPECT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -114,7 +114,6 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
-TCLSH = @TCLSH@
VERSION = @VERSION@
YACC = @YACC@
ac_ct_CC = @ac_ct_CC@
@@ -148,7 +147,6 @@ sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-tclsh = @tclsh@
AUTOMAKE_OPTIONS = dejagnu
EXTRA_DIST = tunit.exp
AM_CXXFLAGS = -I$(top_srcdir) -g