* configure.in: Add KRB5_RUN_FLAGS

	* Makefile.in: Use the run flags.

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

9 files changed, 43 insertions, 18 deletions

diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog
index 737a50a19..ff23e2c68 100644
--- a/src/tests/ChangeLog
+++ b/src/tests/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 18 21:49:39 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* configure.in: Add KRB5_RUN_FLAGS
+
+	* Makefile.in: Use runtime flags.
+
 Wed Feb 28 00:35:58 1996  Theodore Y. Ts'o  <tytso@dcl>
 
 	* configure.in: Build the gssapi tests directory
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index df6984c1a..5632988d9 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,4 +1,5 @@
 CFLAGS = $(CCOPTS)
+RUN_SETUP = @KRB5_RUN_ENV@
 
 TEST_DB = ./testdb
 TEST_REALM = FOO.TEST.REALM
@@ -14,26 +15,26 @@ check-unix:: kdb_check
 
 kdb_check:
 	$(RM) $(TEST_DB)*
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/create/kdb5_create $(KADMIN_OPTS)
-	LD_LIBRARY_PATH=$(TOPLIBD) ../tests/create/kdb5_mkdums $(KTEST_OPTS) 
-	LD_LIBRARY_PATH=$(TOPLIBD) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump"
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db -old $(TEST_DB).odump"
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit -r $(TEST_REALM) -R "load_db $(TEST_DB).dump $(TEST_DB)"
-	LD_LIBRARY_PATH=$(TOPLIBD) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump2"
+	$(RUN_SETUP) ../admin/create/kdb5_create $(KADMIN_OPTS)
+	$(RUN_SETUP) ../tests/create/kdb5_mkdums $(KTEST_OPTS) 
+	$(RUN_SETUP) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
+	$(RUN_SETUP) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump"
+	$(RUN_SETUP) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db -old $(TEST_DB).odump"
+	$(RUN_SETUP) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
+	$(RUN_SETUP) ../admin/edit/kdb5_edit -r $(TEST_REALM) -R "load_db $(TEST_DB).dump $(TEST_DB)"
+	$(RUN_SETUP) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
+	$(RUN_SETUP) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump2"
 	sort $(TEST_DB).dump > $(TEST_DB).sort
 	sort $(TEST_DB).dump2 > $(TEST_DB).sort2
 	cmp $(TEST_DB).sort $(TEST_DB).sort2
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit -r $(TEST_REALM) -R "load_db -old $(TEST_DB).odump $(TEST_DB)"
-	LD_LIBRARY_PATH=$(TOPLIBD) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db -old $(TEST_DB).odump2"
+	$(RUN_SETUP) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
+	$(RUN_SETUP) ../admin/edit/kdb5_edit -r $(TEST_REALM) -R "load_db -old $(TEST_DB).odump $(TEST_DB)"
+	$(RUN_SETUP) ../tests/verify/kdb5_verify $(KTEST_OPTS) 
+	$(RUN_SETUP) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db -old $(TEST_DB).odump2"
 	sort $(TEST_DB).odump > $(TEST_DB).osort
 	sort $(TEST_DB).odump2 > $(TEST_DB).osort2
 	cmp $(TEST_DB).osort $(TEST_DB).osort2
-	LD_LIBRARY_PATH=$(TOPLIBD) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
+	$(RUN_SETUP) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f
 	$(RM) $(TEST_DB)*
 
 
diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 38edc4866..e47a2b2c0 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 18 21:49:39 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* configure.in: Add KRB5_RUN_FLAGS
+
+	* Makefile.in: Use runtime flags.
+
 Sun Mar  3 13:05:57 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* krb5_decode_test.c (main): In krb5_enc_tkt_part (optionals NULL)
diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index e5eb0bd76..07d9d6630 100644
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -1,4 +1,5 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES)
+RUN_SETUP = @KRB5_RUN_ENV@
 
 COMERRLIB=$(TOPLIBD)/libcom_err.a
 
@@ -20,11 +21,11 @@ trval: $(srcdir)/trval.c
 	$(CC) -o trval $(CFLAGS) -DSTANDALONE $(srcdir)/trval.c
 
 check:: krb5_decode_test krb5_encode_test
-	LD_LIBRARY_PATH=$(TOPLIBD) ./krb5_decode_test
+	$(RUN_SETUP) ./krb5_decode_test
 	$(RM) test.out
-	LD_LIBRARY_PATH=$(TOPLIBD) ./krb5_encode_test > test.out
+	$(RUN_SETUP) ./krb5_encode_test > test.out
 	cmp test.out $(srcdir)/reference_encode.out
-	LD_LIBRARY_PATH=$(TOPLIBD) ./krb5_encode_test -t > test.out
+	$(RUN_SETUP) ./krb5_encode_test -t > test.out
 	cmp test.out $(srcdir)/trval_reference.out
 	$(RM) test.out	
 
diff --git a/src/tests/asn.1/configure.in b/src/tests/asn.1/configure.in
index b1257255d..a262f0186 100644
--- a/src/tests/asn.1/configure.in
+++ b/src/tests/asn.1/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(krb5_encode_test.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+KRB5_RUN_FLAGS
 KRB5_LIBRARIES
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/configure.in b/src/tests/configure.in
index eb21e3900..258b17141 100644
--- a/src/tests/configure.in
+++ b/src/tests/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(configure.in)
 CONFIG_RULES
+KRB5_RUN_FLAGS
 CONFIG_DIRS(resolve asn.1 create hammer verify gssapi dejagnu)
 DO_SUBDIRS
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/resolve/ChangeLog b/src/tests/resolve/ChangeLog
index 9b9269b9e..8aa9ad579 100644
--- a/src/tests/resolve/ChangeLog
+++ b/src/tests/resolve/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 18 21:49:39 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* configure.in: Add KRB5_RUN_FLAGS
+
+	* Makefile.in: Use runtime flags.
+
 Wed Sep 13 13:57:40 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* resolve.c (main): Fix fencepost error; use argv[1] to test for a
diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index ac21951dc..2f378db13 100644
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -1,4 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES)
+RUN_SETUP = @KRB5_RUN_ENV@
+
 
 OBJS=resolve.o
 SRCS=$(srcdir)/resolve.c
@@ -9,7 +11,7 @@ resolve: $(OBJS) $(DEPLIBS)
 	$(LD) $(LDFLAGS) $(LDARGS) -o resolve $(OBJS) $(LIBS)
 
 check:: resolve
-	LD_LIBRARY_PATH=$(TOPLIBD) ./resolve
+	$(RUN_SETUP) ./resolve
 
 install::
 
diff --git a/src/tests/resolve/configure.in b/src/tests/resolve/configure.in
index 094c3d757..d13da2d89 100644
--- a/src/tests/resolve/configure.in
+++ b/src/tests/resolve/configure.in
@@ -3,5 +3,6 @@ CONFIG_RULES
 AC_HEADER_STDC
 AC_CHECK_FUNCS(strchr)
 AC_CHECK_HEADERS(sys/param.h sys/socket.h)
+KRB5_RUN_FLAGS
 KRB5_LIBRARIES
 V5_AC_OUTPUT_MAKEFILE