make BACKWARD_COMPAT dtrt

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

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 8f66bb73fefa5821a2ea3104454b4c0cf4a88710..9548589d8a548962fcb587e906f7234d449f7236 100644 (file)
--- 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 cb4a74c69dee90f18c1d6c970fca084e70557d47..1793b21e89ee62775b2862737a638f3beff8fc74 100644 (file)
--- 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])