Makefile.in, configure.in: Only build programs if Tcl is present

No more /mit/gnu/include /mit/gnu/lib assumptions.

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

diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index 5d72e6de59997996a349792c60aabcd88e599929..d77ad746ea66a3a023af38a081828b13ee10466d 100644 (file)
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 14 07:01:34 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * Makefile.in: Only attempt to build programs if Tcl present.
+
+       * configure.in: Test for existance of Tcl libraries.
+
 Thu Sep 26 11:31:57 1996  Ezra Peisach  (epeisach@kangaroo.mit.edu)
 
        * Makefile.in: Link with -ltcl -lm. Order the Makefile so programs

diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index 7668431d2c00bb7d6e5b1a6d16f591e9cb14dee3..ff1c23d66de2ddad6204e28f7b0dbdd9a1c17d04 100644 (file)
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -1,9 +1,7 @@
-# XXX Buzz!
-TCLINC = /mit/gnu/include
-#TCLLIB=-ltcl7.5 -lm
-TCLLIB=-L/mit/gnu/lib -ltcl -lm
+TCLINC=@TCL_INC@
+TCLLIB=@TCL_LIB@ -lm
 
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I$(TCLINC)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCLINC)
 
 SRCS   =       tcl_ovsec_kadm.c tcl_kadm5.c test.c
 OBJS   =       tcl_ovsec_kadm.o tcl_kadm5.o test.o
@@ -11,8 +9,14 @@ OBJS  =       tcl_ovsec_kadm.o tcl_kadm5.o test.o
 CLNTPROG=      ovsec_kadm_clnt_tcl
 SRVPROG        =       ovsec_kadm_srv_tcl
 
+DO_ALL=@DO_ALL@
 
-all:: $(CLNTPROG) $(SRVPROG)
+all:: all-$(DO_ALL)
+
+all-::
+       @echo "Tcl is not installed on this system. The kadm5 test suite cannot be run."
+
+all-tcl:: $(CLNTPROG) $(SRVPROG)
 
 $(SRVPROG): $(OBJS) $(SRVDEPLIBS)
        $(CC) $(LDFLAGS) $(LDARGS) -o $(SRVPROG) $(OBJS) $(SRVLIBS) $(TCLLIB)

diff --git a/src/kadmin/testing/util/configure.in b/src/kadmin/testing/util/configure.in
index aab261c94614772f5508800e1446b99b354cd371..1cccafbfdacf276474882aeda08cc80f4f3a3227 100644 (file)
--- a/src/kadmin/testing/util/configure.in
+++ b/src/kadmin/testing/util/configure.in
@@ -3,6 +3,13 @@ WITH_CCOPTS
 CONFIG_RULES
 AC_PROG_INSTALL
 KRB_INCLUDE
+dnl Test for tcl
+AC_KRB5_TCL    
+if test "$TCL_LIB" != "" ;  then
+       DO_ALL=tcl
+fi
+AC_SUBST(DO_ALL)
+dnl
 USE_KADMCLNT_LIBRARY
 USE_GSSAPI_LIBRARY
 USE_KADMSRV_LIBRARY