Makefile.in (krshd): Move $(K4LIB) after $(KLIB) so that if

	we're using des425, the V5 crypto library can be picked up.

configure.in: Use the correct path to find libdes425

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 9f38f19bff0b5452a2105c24d0cf57d5735bb9e7..66c703db27f1b714433e923674f485e3cfb2cb3e 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,10 @@
+Thu Mar 23 23:23:25 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * Makefile.in (krshd): Move $(K4LIB) after $(KLIB) so that if
+               we're using des425, the V5 crypto library can be picked up.
+
+       * configure.in: Use the correct path to find libdes425
+
 Thu Mar 23 20:22:57 1995  Mark Eichin  <eichin@cygnus.com>
 
        * logutil.c (update_wtmp): initialize ut from ent the way the V4

diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 54abb2ceecffbdcfd9fd0fd36b60933ee47a53b3..8c295b92acc15bcd2427d2470a368c49769bc434 100644 (file)
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -52,7 +52,7 @@ install::
        $(INSTALL_DATA) $(srcdir)/rlogin.M ${DESTDIR}$(CLIENT_MANDIR)/rlogin.1
 
 krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-       $(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(K4LIB) $(KLIB) $(LIBS)
+       $(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(K4LIB) $(LIBS)
 
 install::
        $(INSTALL_PROGRAM) krshd $(DESTDIR)$(SERVER_BINDIR)/krshd

diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index ea5f95b75724a2b2f54c6bd826bfb52cc52cd3c4..f807b65a6de4d6587dcb3c3388602319fae452c3 100644 (file)
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -57,7 +57,7 @@ PATH=$save_path
 dnl
 AC_ARG_WITH([krb4],[include Kerberos V4 support],
 ADD_DEF(-DKRB5_KRB4_COMPAT)
-K4LIB='$(KRB4)/lib/libkrb.a $(KRB4)/lib/libdes425.a',
+K4LIB='$(KRB4)/lib/libkrb.a $(TOPLIBD)/lib/libdes425.a',
 echo "warning: no krb4 backwards compatibility support"
 K4LIB=)
 AC_SUBST(K4LIB)