Check for expect in autoconf and subsititute into env-setup.sh

Do not assume expect is /mit/gnu/expect.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9161 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 8b71e49980f91da130d6a0e1f3f4b7945faab1e4..85b0407779662ff5ba8b633ed5cc10f1ace1e1d4 100644 (file)
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,10 @@
+Thu Oct 10 17:32:22 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * env-setup.shin (EXPECT): Subsititute path for expect from
+               autoconf. 
+
+       * configure.in: Check for expect.
+
 Thu Oct  3 13:16:19 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * env-setup.shin: Renamed env-setup.sh for autoconf use.

diff --git a/src/kadmin/testing/scripts/configure.in b/src/kadmin/testing/scripts/configure.in
index def89da6749cee6966df2ff78dc9bd61df05f9b9..427f1aac8e999ffe7edacf2f2c2f3626c627c81e 100644 (file)
--- a/src/kadmin/testing/scripts/configure.in
+++ b/src/kadmin/testing/scripts/configure.in
@@ -1,6 +1,7 @@
 AC_INIT(init_db)
 CONFIG_RULES
 AC_PATH_PROG(PERL,perl)
+AC_PATH_PROG(EXPECT,expect)
 dnl The following are substituted into env-setup.sh
 AC_SUBST(BUILDTOP)
 AC_SUBST(SRCTOP)

diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index 2c61cc4284912f304f1644d9e17c63807c2340cb..07f8038a0623b18b8e7f86a1b80a05bc7cd18bf0 100644 (file)
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -25,8 +25,7 @@ fi
 
 REALM=SECURE-TEST.OV.COM; export REALM
 
-# XXX This should be detected by configure!
-EXPECT=/mit/gnu/bin/expect; export EXPECT
+EXPECT=@EXPECT@; export EXPECT
 
 COMPARE_DUMP=$TESTDIR/scripts/compare_dump.pl; export COMPARE_DUMP
 FIX_CONF_FILES=$TESTDIR/scripts/fixup-conf-files.pl