Fix broken $(KRB4)/lib/libdes.a inclusion in the Makefile --- should have

been checked and done in configure.in only if KRB4 is defined.

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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 3c72d09b6151bd36407c2d4047b2cd7455171cee..8ef51cae7887568028ad65bb3e480bb2f2c4943a 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 18 18:17:59 1994  Theodore Y. Ts'o  (tytso at tsx-11)
+
+       * configure.in:
+       * Makefile.in: Move optional link with $(KRB4)/lib/libdes.a to
+       configure.in.
+
 Thu Aug  4 15:13:27 1994  Tom Yu  (tlyu@dragons-lair)
 
        * configure.in:

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index c6310f07e19bb990eba79407082ee683931a2d2b..3fa4e6c24a6fe8312dffefe05c2c0e8af0904b01 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -55,7 +55,7 @@ kdc5_err.h: kdc5_err.et
 kdc5_err.o: kdc5_err.h
 
 krb5kdc: $(OBJS) $(KDBDEPLIB) $(DEPKLIB)
-       $(CC) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KLIB) $(K4LIB) $(LIBS) $(KRB4)/lib/libdes.a
+       $(CC) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KLIB) $(K4LIB) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc

diff --git a/src/kdc/configure.in b/src/kdc/configure.in
index b1da02991ff226a30c9a729c7bfae9d3a40507ea..e840ce250c3b82a6ead66c1fc69cd8387f67f4cf 100644 (file)
--- a/src/kdc/configure.in
+++ b/src/kdc/configure.in
@@ -17,7 +17,7 @@ WITH_KRB5ROOT
 AC_WITH([krb4],
 ADD_DEF(-DKRB4)
 ADD_DEF(-DBACKWARD_COMPAT)
-K4LIB='$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a',
+K4LIB='$(KRB4)/lib/libkrb.a $(TOPLIBD)/libdes425.a $(KRB4)/lib/libdes.a',
 echo "warning: no krb4 support will be built in kdc"
 K4LIB=)
 AC_SUBST(K4LIB)