From: Ezra Peisach Date: Tue, 19 Mar 1996 03:03:57 +0000 (+0000) Subject: * configure.in: Add KRB5_RUN_FLAGS X-Git-Tag: krb5-1.0-beta6~337 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ab9dff20b4ce34943153c1a6f31a2bd23daeed6;p=krb5.git * 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 --- diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 7721c8606..5aeeffc60 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,9 @@ +Mon Mar 18 21:46:39 1996 Ezra Peisach + + * configure.in: Add KRB5_RUN_FLAGS + + * Makefile.in: Use the run flags. + Sun Mar 17 20:55:41 1996 Ezra Peisach * configure.in: Change WITH_KDB_DB to USE_KDB5_LIBRARIES and add diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index a725dbe7c..7b1176d89 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -1,4 +1,5 @@ CFLAGS = $(CCOPTS) $(DEFS) +KRB5_RUN_ENV = @KRB5_RUN_ENV@ all:: $(OBJS) @@ -42,7 +43,7 @@ t_kdb: t_kdb.o $(DEPLIBS) $(LD) $(LDFLAGS) $(LDARGS) -o t_kdb t_kdb.o $(LIBS) check:: t_kdb - LD_LIBRARY_PATH=$(TOPLIBD) ; export LD_LIBRARY_PATH ; ./t_kdb + $(KRB5_RUN_ENV) ./t_kdb clean:: $(RM) t_kdb t_kdb.o diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in index 2065cfa24..ec7f93ec1 100644 --- a/src/lib/kdb/configure.in +++ b/src/lib/kdb/configure.in @@ -6,6 +6,7 @@ AC_PROG_RANLIB AC_PROG_INSTALL AC_HAVE_HEADERS(unistd.h) AC_CHECK_FUNCS(srand48 srand srandom umask) +KRB5_RUN_FLAGS V5_USE_SHARED_LIB USE_KDB5_LIBRARY KRB5_LIBRARIES diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 613607ce9..9fb871daf 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,6 +1,12 @@ +Mon Mar 18 21:49:39 1996 Ezra Peisach + + * configure.in: Add KRB5_RUN_FLAGS + + * Makefile.in: Use runtime flags. + Sun Mar 17 20:32:08 1996 Ezra Peisach - * configure.in: Add USE_ANAME, USE_KRB5_LIBRAR, KRB5_LIBRARIES so + * configure.in: Add USE_ANAME, USE_KRB5_LIBRARY, KRB5_LIBRARIES so that Makefile does not have to know build tree layout. * Makefile.in: Rework to be consistant with configure defines so diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 8a251b4cb..7737f2e5f 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -1,4 +1,5 @@ CFLAGS = $(CCOPTS) $(DEFS) +RUN_SETUP = @KRB5_RUN_ENV@ ##DOSBUILDTOP = ..\..\.. ##DOSLIBNAME=..\krb5.lib @@ -181,7 +182,7 @@ TEST_PROGS= t_walk_rtree t_kerb t_ser check-unix:: $(TEST_PROGS) KRB5_CONFIG=$(srcdir)/t_krb5.conf ; export KRB5_CONFIG ;\ - ./t_kerb 425_conv_principal rcmd e40-po ATHENA.MIT.EDU \ + $(RUN_SETUP) ./t_kerb 425_conv_principal rcmd e40-po ATHENA.MIT.EDU \ 425_conv_principal rcmd mit ATHENA.MIT.EDU \ 425_conv_principal rcmd lithium ATHENA.MIT.EDU \ 425_conv_principal rcmd tweedledumb CYGNUS.COM \ @@ -191,7 +192,7 @@ check-unix:: $(TEST_PROGS) > test.out cmp test.out $(srcdir)/t_ref_kerb.out $(RM) test.out - ./t_ser + $(RUN_SETUP) ./t_ser check-mac:: $(TEST_PROGS) diff --git a/src/lib/krb5/krb/configure.in b/src/lib/krb5/krb/configure.in index a0e11d159..7e3e2e9c4 100644 --- a/src/lib/krb5/krb/configure.in +++ b/src/lib/krb5/krb/configure.in @@ -6,6 +6,7 @@ AC_PROG_RANLIB AC_HEADER_STDARG V5_SHARED_LIB_OBJS AC_HAVE_FUNCS(strftime strptime) +KRB5_RUN_FLAGS SubdirLibraryRule([$(OBJS)]) USE_ANAME USE_KDB5_LIBRARY diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index edbf316a4..b8fa4c2fe 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,9 @@ +Mon Mar 18 21:49:39 1996 Ezra Peisach + + * configure.in: Add KRB5_RUN_FLAGS + + * Makefile.in: Use runtime flags. + Mon Mar 18 17:30:54 1996 Ezra Peisach * sn2princ.c (krb5_sname_to_principal): Add casting to avoid warnings. diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index f45b4478c..6e23fa75b 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -1,4 +1,5 @@ CFLAGS = $(CCOPTS) $(DEFS) +KRB5_RUN_ENV = @KRB5_RUN_ENV@ ##DOSBUILDTOP = ..\..\.. ##DOSLIBNAME=..\krb5.lib @@ -112,7 +113,7 @@ t_an_to_ln: $(T_AN_TO_LN_OBJS) $(DEPLIBS) check-unix:: $(TEST_PROGS) KRB5_CONFIG=$(srcdir)/td_krb5.conf ; export KRB5_CONFIG ;\ - ./t_std_conf -d -s NEW.DEFAULT.REALM -d \ + $(KRB5_RUN_ENV) ./t_std_conf -d -s NEW.DEFAULT.REALM -d \ -k IGGY.ORG -k DEFAULT_REALM.TST \ -D DEFAULT_REALM.TST -r bad.idea -r itar.bad.idea \ -r really.BAD.IDEA. -r clipper.bad.idea -r KeYEsCrOW.BaD.IDea \ @@ -129,8 +130,7 @@ check-unix:: echo '[realms]' >> ./t_an.conf echo 'r = {' >> ./t_an.conf if test -r ../../../admin/aname/kdb5_anadd ; then \ - LD_LIBRARY_PATH=$(TOPLIBD) ; export LD_LIBRARY_PATH ; \ - ../../../admin/aname/kdb5_anadd -a -n ./t_an p/i/i/i@r piii; \ + $(KRB5_RUN_ENV) ../../../admin/aname/kdb5_anadd -a -n ./t_an p/i/i/i@r piii; \ ../../../admin/aname/kdb5_anadd -a -n ./t_an p/a/b/c@r pabc; \ echo 'auth_to_local = DB:./t_an' >> ./t_an.conf; \ fi @@ -140,12 +140,12 @@ check-unix:: echo '}' >> ./t_an.conf if test -r ../../../admin/aname/kdb5_anadd ; then \ KRB5_CONFIG=./t_an.conf ; export KRB5_CONFIG ; \ - ./t_an_to_ln p/i/i/i@r p/a/b/c@r; \ + $(KRB5_RUN_ENV) ./t_an_to_ln p/i/i/i@r p/a/b/c@r; \ fi KRB5_CONFIG=./t_an.conf ; export KRB5_CONFIG ; \ - ./t_an_to_ln rul/helpme/e@r ru/123/le@r + $(KRB5_RUN_ENV) ./t_an_to_ln rul/helpme/e@r ru/123/le@r KRB5_CONFIG=./t_an.conf ; export KRB5_CONFIG ; \ - ./t_an_to_ln fred/r@r barney/r@r + $(KRB5_RUN_ENV) ./t_an_to_ln fred/r@r barney/r@r rm ./t_an.* clean:: diff --git a/src/lib/krb5/os/configure.in b/src/lib/krb5/os/configure.in index 7c7244315..f3a48865f 100644 --- a/src/lib/krb5/os/configure.in +++ b/src/lib/krb5/os/configure.in @@ -11,5 +11,6 @@ AC_DEFINE(AN_TO_LN_RULES) USE_ANAME V5_SHARED_LIB_OBJS KRB5_LIBRARIES +KRB5_RUN_FLAGS SubdirLibraryRule([${OBJS}]) V5_AC_OUTPUT_MAKEFILE 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 + + * configure.in: Add KRB5_RUN_FLAGS + + * Makefile.in: Use runtime flags. + Wed Feb 28 00:35:58 1996 Theodore Y. Ts'o * 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 + + * configure.in: Add KRB5_RUN_FLAGS + + * Makefile.in: Use runtime flags. + Sun Mar 3 13:05:57 1996 Ezra Peisach * 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 + + * configure.in: Add KRB5_RUN_FLAGS + + * Makefile.in: Use runtime flags. + Wed Sep 13 13:57:40 1995 Theodore Y. Ts'o * 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