summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1996-10-14 11:05:52 +0000
committerEzra Peisach <epeisach@mit.edu>1996-10-14 11:05:52 +0000
commit9f759cb00f1fe9dea0583dbd9cefbc5443fc2256 (patch)
treed7ccf810121b795d3626cfe2cb567547bba4926a /src/lib
parentd43c8f7d9f983b12ce49bb4e05d5c251c8521659 (diff)
downloadkrb5-9f759cb00f1fe9dea0583dbd9cefbc5443fc2256.tar.gz
krb5-9f759cb00f1fe9dea0583dbd9cefbc5443fc2256.tar.xz
krb5-9f759cb00f1fe9dea0583dbd9cefbc5443fc2256.zip
* Makefile.in: Only try to run tests if both runtest and the tcl
libraries present. * configure.in: Check for runtest and Tcl. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9167 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/kadm5/unit-test/ChangeLog7
-rw-r--r--src/lib/kadm5/unit-test/Makefile.in7
-rw-r--r--src/lib/kadm5/unit-test/configure.in6
3 files changed, 19 insertions, 1 deletions
diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 611aec8bdb..997b410862 100644
--- a/src/lib/kadm5/unit-test/ChangeLog
+++ b/src/lib/kadm5/unit-test/ChangeLog
@@ -1,3 +1,10 @@
+Mon Oct 14 07:04:27 1996 Ezra Peisach <epeisach@kangaroo.mit.edu>
+
+ * Makefile.in: Only try to run tests if both runtest and the tcl
+ libraries present.
+
+ * configure.in: Check for runtest and Tcl.
+
Fri Oct 4 08:31:50 1996 Ezra Peisach <epeisach@kangaroo.mit.edu>
* sizes-test.c: Removed program.
diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in
index 2e22e774c6..c2fb0c403f 100644
--- a/src/lib/kadm5/unit-test/Makefile.in
+++ b/src/lib/kadm5/unit-test/Makefile.in
@@ -46,7 +46,12 @@ server-iter-test: iter-test.o $(SRVDEPLIBS)
# The unit-test targets
#
-check unit-test:: unit-test-client unit-test-server
+check:: check-@RUNTEST@-@DO_TCL@
+
+check-- check-runtest- check--tcl::
+ @echo "Either tcl or runtest is unavailable. Kadm5 unit tests not run"
+
+check-runtest-tcl unit-test:: unit-test-client unit-test-server
unit-test-client: unit-test-client-setup unit-test-client-body \
unit-test-client-cleanup
diff --git a/src/lib/kadm5/unit-test/configure.in b/src/lib/kadm5/unit-test/configure.in
index ce06b65067..5686f081f0 100644
--- a/src/lib/kadm5/unit-test/configure.in
+++ b/src/lib/kadm5/unit-test/configure.in
@@ -2,6 +2,12 @@ AC_INIT(init-test.c)
WITH_CCOPTS
CONFIG_RULES
KRB_INCLUDE
+AC_CHECK_PROG(RUNTEST,runtest,runtest)
+AC_KRB5_TCL
+if test "$TCL_LIB" != "" ; then
+ DO_TCL=tcl
+fi
+AC_SUBST(DO_TCL)
USE_KADMCLNT_LIBRARY
USE_GSSAPI_LIBRARY
USE_KADMSRV_LIBRARY