punt K4INCLUDE, just use srcdir correctly; put krbONE in kerberos_v4.c for now

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

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 21c72527ac75023f2b3aa1b0bd24c850ec48dd38..0e5dddaf60c3a29351c65781a38c267b57a8a9ef 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -5,9 +5,8 @@ DEFS = @DEFS@
 LIBS = @LIBS@
 KRB4 = @KRB4@
 K4LIB = @K4LIB@
-K4INCLUDE = @K4INCLUDE@
 
-CFLAGS = -g $(DEFS) $(LOCALINCLUDE) $(K4INCLUDE)
+CFLAGS = -g $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
 BUILDTOP=..
@@ -25,7 +24,7 @@ AWK = @AWK@
 
 KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(ISODELIB) $(COMERRLIB) $(DBMLIB)
 
-KRB4INCLUDES=-I$(BUILDTOP)/include/kerberosIV
+KRB4INCLUDES=-I$(SRCTOP)/include/kerberosIV
 
 all::
 

diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index b24f3e03e904d60e3010473332c1364a776f9812..1793b21e89ee62775b2862737a638f3beff8fc74 100644 (file)
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -10,7 +10,6 @@ AC_WITH([krb4],
 ADD_DEF(-DKRB4)
 ADD_DEF(-DBACKWARD_COMPAT)
 K4LIB='$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a',
-K4INCLUDE='-I$(KRB4)/include'
 echo "warning: no krb4 support will be built in kdc"
 K4LIB=)
 AC_SUBST(K4LIB)

diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c
index d605a4167b6418724c039ef03548398ddd5914f8..2abeb40538ce465e948ddb50360510bf08208d4e 100644 (file)
--- a/src/kdc/kerberos_v4.c
+++ b/src/kdc/kerberos_v4.c
@@ -65,6 +65,9 @@ static char rcsid_kerberos_v4_c[] =
 
 extern int errno;
 
+/* take this out when we don't need it anymore */
+int krbONE = 1;
+
 #ifdef notdef
 static struct sockaddr_in sin = {AF_INET};
 #endif