From 37507bb9e189d2c36f825b99d48d6c521510ae74 Mon Sep 17 00:00:00 2001 From: Ezra Peisach Date: Thu, 10 Oct 1996 21:34:56 +0000 Subject: [PATCH] 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 --- src/kadmin/testing/scripts/ChangeLog | 7 +++++++ src/kadmin/testing/scripts/configure.in | 1 + src/kadmin/testing/scripts/env-setup.shin | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index 8b71e4998..85b040777 100644 --- 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 + + * env-setup.shin (EXPECT): Subsititute path for expect from + autoconf. + + * configure.in: Check for expect. + Thu Oct 3 13:16:19 1996 Ezra Peisach * 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 def89da67..427f1aac8 100644 --- 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 2c61cc428..07f8038a0 100644 --- 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 -- 2.26.2