From e7c4d4c153de113a05e9a92505839b0493ddd77f Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Thu, 23 May 1996 23:34:05 +0000 Subject: [PATCH] Use KRB5_RUN_FLAGS in configure.in, and use appropriate run flags for each test so shared libraries are happy. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8119 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/md4/ChangeLog | 4 ++++ src/lib/crypto/md4/Makefile.in | 5 +++-- src/lib/crypto/md4/configure.in | 1 + src/lib/crypto/md5/ChangeLog | 4 ++++ src/lib/crypto/md5/Makefile.in | 6 +++--- src/lib/crypto/md5/configure.in | 1 + src/lib/des425/ChangeLog | 4 ++++ src/lib/des425/Makefile.in | 7 ++++--- src/lib/des425/configure.in | 1 + 9 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index f6809ba06..9e7b9c225 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,7 @@ +Thu May 23 19:24:33 1996 Sam Hartman + + * Makefile.in (RUN_SETUP): use KRB5_RUN_FLAGS + Tue May 21 22:33:12 1996 Richard Basch * md4crypto.c: Incorrrect size arguments were being passed causing diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index a5fa26fa9..c7af3d1b0 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -3,6 +3,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I"$(srcdir)" ##DOSBUILDTOP = ..\..\.. ##DOSLIBNAME=..\crypto.lib +RUN_SETUP=@KRB5_RUN_ENV@ .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -43,8 +44,8 @@ t_cksum: t_cksum.o $(TOPLIBD)/libcrypto.a $(CC) $(CFLAGS) -o t_cksum t_cksum.o $(TOPLIBD)/libcrypto.a $(LIBS) check-unix:: t_mddriver t_cksum - $(C)t_mddriver -x - $(C)t_cksum "this is a test" + $(RUN_SETUP) $(C)t_mddriver -x + $(RUN_SETUP) $(C)t_cksum "this is a test" check-windows:: t_mddriver$(EXEEXT) $(C)t_mddriver$(EXEEXT) -x diff --git a/src/lib/crypto/md4/configure.in b/src/lib/crypto/md4/configure.in index 7eff1bc8b..51d99cb2d 100644 --- a/src/lib/crypto/md4/configure.in +++ b/src/lib/crypto/md4/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) CONFIG_RULES +KRB5_RUN_FLAGS V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index b5a2a6698..657cf49b9 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,7 @@ +Tue May 21 20:29:03 1996 Sam Hartman + + * Makefile.in (check-unix): Use KRB5_RUN_FLAGS + Mon May 20 17:19:00 1996 Theodore Y. Ts'o * md5crypto.c, md5crypto.h: Change use of RSA_MD5_DES_CKSUM_LENGTH diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index 9f710f1bb..f7d3292ad 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -2,7 +2,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des ##DOSBUILDTOP = ..\..\.. ##DOSLIBNAME=..\crypto.lib - +RUN_SETUP = @KRB5_RUN_ENV@ .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @SHARED_RULE@ @@ -28,8 +28,8 @@ t_cksum: t_cksum.o $(TOPLIBD)/libcrypto.a $(CC) $(CFLAGS) -o t_cksum t_cksum.o $(TOPLIBD)/libcrypto.a $(LIBS) check-unix:: t_mddriver t_cksum - $(C)t_mddriver -x - $(C)t_cksum "this is a test" + $(RUN_SETUP) $(C)t_mddriver -x + $(RUN_SETUP) $(C)t_cksum "this is a test" check-windows:: t_mddriver$(EXEEXT) $(C)t_mddriver$(EXEEXT) -x diff --git a/src/lib/crypto/md5/configure.in b/src/lib/crypto/md5/configure.in index 7eff1bc8b..51d99cb2d 100644 --- a/src/lib/crypto/md5/configure.in +++ b/src/lib/crypto/md5/configure.in @@ -1,5 +1,6 @@ AC_INIT(configure.in) CONFIG_RULES +KRB5_RUN_FLAGS V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 074cccdcd..ccc4f1853 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,7 @@ +Tue May 21 20:42:16 1996 Sam Hartman + + * Makefile.in (check-unix): Use KRB5_RUN_FLAGS + Mon May 13 15:24:18 1996 Ezra Peisach * Makefile.in (SHLIB_LIBS): For shared library, add dependency on diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index aeebaeb4c..4c1f14ab5 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -2,6 +2,7 @@ CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/k ##DOSBUILDTOP = ..\.. ##DOSLIBNAME=libdes425.lib +RUN_SETUP=@KRB5_RUN_ENV@ .c.o: $(CC) $(CFLAGS) -c $(srcdir)/$*.c @@ -65,9 +66,9 @@ verify: verify.o libdes425.a $(DEPKLIB) $(CC) -o $@ verify.o $(LDFLAGS) $(EXT_LIB) check-unix:: verify - ./verify -z - ./verify -m - ./verify + $(RUN_SETUP) ./verify -z + $(RUN_SETUP) ./verify -m + $(RUN_SETUP) ./verify check-windows:: diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in index d47af2a2a..08126b06c 100644 --- a/src/lib/des425/configure.in +++ b/src/lib/des425/configure.in @@ -28,5 +28,6 @@ CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto AC_SUBST(CRYPTO_SH_VERS) KRB5_SH_VERS=$krb5_cv_shlib_version_libkrb5 AC_SUBST(KRB5_SH_VERS) +KRB5_RUN_FLAGS V5_MAKE_SHARED_LIB(libdes425,0.1,.., ./des425) V5_AC_OUTPUT_MAKEFILE -- 2.26.2