summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kdc/ChangeLog5
-rw-r--r--src/kdc/Makefile.in5
-rw-r--r--src/kdc/configure.in8
3 files changed, 7 insertions, 11 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 00a6f89aef..5e7e131bb1 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 27 13:52:22 1995 Mark Eichin <eichin@cygnus.com>
+
+ * Makefile.in (krb5kdc): use KRB4_LIB directly.
+ * configure.in: use WITH_KRB4 as-is.
+
Wed Apr 26 11:23:11 1995 Mark Eichin <eichin@cygnus.com>
* configure.in: need HAS_ANSI_VOLATILE for signal_requests_exit.
diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 43081ad0bd..5273db92ba 100644
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -1,5 +1,4 @@
-KRB4 = @KRB4@
-K4LIB = @K4LIB@
+KRB4_LIB = @KRB4_LIB@
CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
LDFLAGS = -g
@@ -55,7 +54,7 @@ kdc5_err.h: kdc5_err.et
kdc5_err.o: kdc5_err.h
krb5kdc: $(OBJS) $(KDBDEPLIB) $(DEPKLIB)
- $(CC) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(K4LIB) $(KLIB) $(LIBS)
+ $(CC) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KRB4_LIB) $(KLIB) $(LIBS)
install::
$(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index 063236aa42..1544e5d200 100644
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -12,12 +12,4 @@ HAS_ANSI_VOLATILE
KRB_INCLUDE
WITH_KRB4
WITH_KRB5ROOT
-AC_ARG_WITH([krb4],
-[ --with-krb4=KRB4DIR build with Kerberos V4 backwards compatibility],
-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)
V5_AC_OUTPUT_MAKEFILE