diff options
| author | Tom Yu <tlyu@mit.edu> | 1994-06-14 21:18:07 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1994-06-14 21:18:07 +0000 |
| commit | beedc2e5a457060ebff7111954200814bc4eb8a6 (patch) | |
| tree | c0067ab488f88f3c8570fbc2eeb39c2d39e180e1 /src | |
| parent | 9919d5f012c6b0ebacd3d0aecaa2eb120ff9c888 (diff) | |
make BACKWARD_COMPAT dtrt
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3784 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kdc/Makefile.in | 13 | ||||
| -rw-r--r-- | src/kdc/configure.in | 8 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index 8f66bb73f..9548589d8 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -3,7 +3,9 @@ VPATH = @srcdir@ DEFS = @DEFS@ LIBS = @LIBS@ - +KRB4 = @KRB4@ +K4LIB = @K4LIB@ + CFLAGS = -g $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g @@ -22,16 +24,13 @@ AWK = @AWK@ KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) $(DBMLIB) -all:: +KRB4INCLUDES=-I$(BUILDTOP)/include/kerberosIV +all:: -#ifdef Krb4KDCCompat -KRB4DEF = -DKRB4 -K4LIB=$(KRB4LIB) -#endif DEFINES = -DBACKWARD_COMPAT $(KRB4DEF) -INCLUDES = $(KRB4INCLUDES) -I. +LOCALINCLUDE = $(KRB4INCLUDES) -I. SRCS= \ kdc5_err.c \ $(srcdir)/dispatch.c \ diff --git a/src/kdc/configure.in b/src/kdc/configure.in index cb4a74c69..1793b21e8 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -5,4 +5,12 @@ ET_RULES CONFIG_RULES KRB_INCLUDE ISODE_INCLUDE +WITH_KRB4 +AC_WITH([krb4], +ADD_DEF(-DKRB4) +ADD_DEF(-DBACKWARD_COMPAT) +K4LIB='$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a', +echo "warning: no krb4 support will be built in kdc" +K4LIB=) +AC_SUBST(K4LIB) AC_OUTPUT(Makefile,[EXTRA_RULES]) |