diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1996-10-14 11:03:15 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1996-10-14 11:03:15 +0000 |
| commit | d43c8f7d9f983b12ce49bb4e05d5c251c8521659 (patch) | |
| tree | 0641493c3a9174c3bbf749961bb07443b69c71ba /src/kadmin/testing | |
| parent | ff5833da6d14532e223abe8423770a6fb04c5562 (diff) | |
| download | krb5-d43c8f7d9f983b12ce49bb4e05d5c251c8521659.tar.gz krb5-d43c8f7d9f983b12ce49bb4e05d5c251c8521659.tar.xz krb5-d43c8f7d9f983b12ce49bb4e05d5c251c8521659.zip | |
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
Diffstat (limited to 'src/kadmin/testing')
| -rw-r--r-- | src/kadmin/testing/util/ChangeLog | 6 | ||||
| -rw-r--r-- | src/kadmin/testing/util/Makefile.in | 16 | ||||
| -rw-r--r-- | src/kadmin/testing/util/configure.in | 7 |
3 files changed, 23 insertions, 6 deletions
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog index 5d72e6de59..d77ad746ea 100644 --- 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 7668431d2c..ff1c23d66d 100644 --- 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 aab261c946..1cccafbfda 100644 --- 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 |