diff options
| author | Mark Eichin <eichin@mit.edu> | 1994-06-15 20:01:40 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1994-06-15 20:01:40 +0000 |
| commit | 7d75373d4bbfd49e0a4924a76ff18152a61ded4a (patch) | |
| tree | 21b5f3579159434346f1a4d026a1c9f6f316db26 | |
| parent | 27c00af94ac31572afe856974f1b2a971bfab8a0 (diff) | |
| download | krb5-7d75373d4bbfd49e0a4924a76ff18152a61ded4a.tar.gz krb5-7d75373d4bbfd49e0a4924a76ff18152a61ded4a.tar.xz krb5-7d75373d4bbfd49e0a4924a76ff18152a61ded4a.zip | |
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
| -rw-r--r-- | src/kdc/Makefile.in | 5 | ||||
| -rw-r--r-- | src/kdc/configure.in | 1 | ||||
| -rw-r--r-- | src/kdc/kerberos_v4.c | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index 21c72527a..0e5dddaf6 100644 --- 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 b24f3e03e..1793b21e8 100644 --- 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 d605a4167..2abeb4053 100644 --- 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 |