From a7e76ad330b11033b41b87820073d89286e97020 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@mit.edu>
Date: Thu, 23 May 1996 23:32:51 +0000
Subject: [PATCH] Use KRB5_RUN_FLAGS in configure.in, and use appropriate run
 flags for each test so shared libraries are happy.

	Also, for tests that use weak or zero keys, make sure we link
in enough object modules to allow us to overide parts of libcrypto
even on systems with early binding in shared libs lik AIX.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8118 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/crypto/des/ChangeLog    | 11 +++++++++++
 src/lib/crypto/des/Makefile.in  | 15 +++++++++------
 src/lib/crypto/des/configure.in |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index 0c1292507..f980270ad 100644
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,3 +1,14 @@
+Tue May 21 19:30:10 1996  Sam Hartman  <hartmans@mit.edu>
+
+	* Makefile.in (check-unix): In building destest and verify, make
+ 	sure we include enough object modules to deal with systems that do
+ 	early binding in shared libs, so we porperly overide
+ 	mit_des_is_weak_key
+
+:reset
+	* Makefile.in (check-unix): Use $(RUN_SETUP) so shared lib paths
+ 	are happy.
+
 Sat May 18 02:02:59 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* u_nfold.c (mit_des_n_fold): Fix memory leak.  Free tempbuf
diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in
index 62aceb2c8..7b033866c 100644
--- a/src/lib/crypto/des/Makefile.in
+++ b/src/lib/crypto/des/Makefile.in
@@ -7,6 +7,7 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.$(LIBEXT)
 
 KLIB = $(TOPLIBD)/libkrb5.$(LIBEXT) $(TOPLIBD)/libcrypto.$(LIBEXT) $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.$(LIBEXT) $(TOPLIBD)/libcrypto.$(LIBEXT) $(COMERRLIB)
+RUN_SETUP = @KRB5_RUN_ENV@
 
 .c.o:
 	$(CC) $(CFLAGS) -c $(srcdir)/$*.c
@@ -79,10 +80,12 @@ clean::
 	$(RM) fp.c ip.c key_perm.h odd.h p.c p_table.h s_table.h
 
 verify$(EXEEXT): t_verify.$(OBJEXT) $(DEPKLIB)
-	$(CC) -o $@ t_verify.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
+	$(CC) -o $@ t_verify.$(OBJEXT) process_ky.o  key_sched.o\
+	../cryptoconf.o ../des_crc.o $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
 
 destest$(EXEEXT): destest.$(OBJEXT) $(DEPKLIB)
-	$(CC) -o $@ destest.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
+	$(CC) -o $@ destest.$(OBJEXT) process_ky.o key_sched.o\
+	../cryptoconf.o ../des_crc.o  $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
 
 t_random$(EXEEXT): t_random.$(OBJEXT) $(DEPKLIB)
 	$(LD) -o $@ t_random.$(OBJEXT) $(KLIB) $(LIBS) $(CFLAGS) $(LDFLAGS) 
@@ -90,10 +93,10 @@ t_random$(EXEEXT): t_random.$(OBJEXT) $(DEPKLIB)
 check-mac: check-unix
 
 check-unix:: destest verify
-	./verify -z
-	./verify -m
-	./verify
-	./destest < $(srcdir)/keytest.data
+	$(RUN_SETUP) ./verify -z
+	$(RUN_SETUP) ./verify -m
+	$(RUN_SETUP) ./verify
+	$(RUN_SETUP) ./destest < $(srcdir)/keytest.data
 
 check-windows::
 
diff --git a/src/lib/crypto/des/configure.in b/src/lib/crypto/des/configure.in
index 7eff1bc8b..10592aab2 100644
--- a/src/lib/crypto/des/configure.in
+++ b/src/lib/crypto/des/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
 V5_SHARED_LIB_OBJS
+KRB5_RUN_FLAGS
 SubdirLibraryRule([${OBJS}])
 V5_AC_OUTPUT_MAKEFILE
-- 
2.26.2