* 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

diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog
index 611aec8bdb3b587b6ac68a31d014bd164953a0bb..997b41086201b35569e9ab0d032087c03de864e9 100644 (file)
--- 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 2e22e774c61905dba64b84e987f06d6f19696a06..c2fb0c403ff5e3fada51bbaaf0653bc6fd74def7 100644 (file)
--- 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 ce06b65067cdab5c86fe066e2a110cc89e330787..5686f081f0b29adef78e737d37cfcecf019b579c 100644 (file)
--- 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