From: Theodore Tso <tytso@mit.edu>
Date: Fri, 24 Mar 1995 04:28:07 +0000 (+0000)
Subject: Makefile.in (krshd): Move $(K4LIB) after $(KLIB) so that if
X-Git-Tag: krb5-1.0-beta5~484
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b29305dbf20e99c8e3ed6872810f96dc049cd57;p=krb5.git

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 9f38f19bf..66c703db2 100644
--- 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 54abb2cee..8c295b92a 100644
--- 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 ea5f95b75..f807b65a6 100644
--- 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)