* Makefile.in: Only run tests if required programs, libraries

		available.

	* configure.in: Check for runtest, Perl, and tcl before making checks.

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

diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog
index 2adbe13205a021432e165b42636fd4c15ccfd50f..a5d21e8a5cf2cc3cda061fdd438ea243c6b9af93 100644 (file)
--- a/src/lib/rpc/unit-test/ChangeLog
+++ b/src/lib/rpc/unit-test/ChangeLog
@@ -1,3 +1,11 @@
+Thu Oct 31 08:47:47 1996  Ezra Peisach  <epeisach@mit.edu>
+
+       * Makefile.in: Only run tests if required programs, libraries
+               available.  
+
+       * configure.in: Check for runtest, Perl, and tcl before making checks. 
+
+
 Thu Oct 24 17:20:11 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * Makefile.in, rpc_test_clnt.c, rpc_test_svc.c, rpc_test.h:

diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in
index 28e6862f5dfe8f26cbab9a92754ff9a42c0465fb..57f75cdbc66e39b1dc03b1b40b60d884a896e447 100644 (file)
--- a/src/lib/rpc/unit-test/Makefile.in
+++ b/src/lib/rpc/unit-test/Makefile.in
@@ -24,7 +24,13 @@ client.c server.c: rpc_test.h
 #      rm -f rpc_test.h rpc_test_clnt.c rpc_test_svc.c
 # 
 
-check unit-test:: unit-test-setup unit-test-body unit-test-cleanup
+check unit-test:: unit-test-@DO_TEST@
+
+unit-test-:
+       @echo "The rpc tests require PERL, Tcl, and runtest"
+       @echo "No tests run here"
+
+unit-test-ok:: unit-test-setup unit-test-body unit-test-cleanup
 
 unit-test-body::       
        RPC_TEST_SRVTAB=/tmp/rpc_test_v5srvtab $(ENV_SETUP) \

diff --git a/src/lib/rpc/unit-test/configure.in b/src/lib/rpc/unit-test/configure.in
index 1d02edc2eb47ba1f314f2a1e67c1e7a1fbdf2b36..5e2f1b8a359981f0b6b148a29fec357d06b4a10d 100644 (file)
--- a/src/lib/rpc/unit-test/configure.in
+++ b/src/lib/rpc/unit-test/configure.in
@@ -2,9 +2,20 @@ AC_INIT(client.c)
 WITH_CCOPTS
 CONFIG_RULES
 KRB_INCLUDE
+
+dnl The following are tests for the presence of programs required for testing 
+AC_CHECK_PROG(RUNTEST,runtest,runtest)
+AC_CHECK_PROG(PERL,perl,perl)
+AC_KRB5_TCL    
+if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIB" != ""; then
+       DO_TEST=ok
+fi
+AC_SUBST(DO_TEST) 
+dnl
 USE_GSSRPC_LIBRARY
 USE_GSSAPI_LIBRARY
 USE_DYN_LIBRARY
 V5_USE_SHARED_LIB
 KRB5_LIBRARIES
+
 V5_AC_OUTPUT_MAKEFILE