diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/util/et/ChangeLog | 9 | ||||
| -rw-r--r-- | src/util/et/Makefile.in | 20 | ||||
| -rw-r--r-- | src/util/et/configure.in | 2 |
3 files changed, 25 insertions, 6 deletions
diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index 2b3922a39..f60d97742 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,3 +1,12 @@ +2004-05-04 Ken Raeburn <raeburn@mit.edu> + + * configure.in: Invoke KRB5_BUILD_PROGRAM and KRB5_RUN_FLAGS. + * Makefile.in (PROG_RPATH, PROG_LIBPATH, RUN_SETUP): New + variables. + (test_et, t_com_err): Use the built library, even if shared. + (check-unix): Set up the environment properly to load shared + libraries when running the test programs. + 2004-04-29 Ken Raeburn <raeburn@mit.edu> * Makefile.in (LIBINITFUNC, LIBFINIFUNC): New variables. diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index f9ca799b4..1aa4887be 100644 --- a/src/util/et/Makefile.in +++ b/src/util/et/Makefile.in @@ -120,10 +120,17 @@ ITS4OPTS= do-its4: error_table.y et_lex.lex.c $(ITS4) $(ITS4OPTS) $(SRCS) -test_et: test_et.o test1.o test2.o $(LIBOBJS) - $(CC) -o test_et test_et.o test1.o test2.o $(LIBOBJS) -t_com_err: t_com_err.o et1.o et2.o $(LIBOBJS) - $(CC) -o t_com_err t_com_err.o et1.o et2.o $(LIBOBJS) +#test_et: test_et.o test1.o test2.o $(LIBOBJS) +# $(CC) -o test_et test_et.o test1.o test2.o $(LIBOBJS) +#t_com_err: t_com_err.o et1.o et2.o $(LIBOBJS) +# $(CC) -o t_com_err t_com_err.o et1.o et2.o $(LIBOBJS) + +PROG_RPATH=$(KRB5_LIBDIR) +PROG_LIBPATH=-L$(TOPLIBD) +test_et: test_et.o test1.o test2.o $(COM_ERR_DEPLIB) + $(CC_LINK) -o test_et test_et.o test1.o test2.o -lcom_err +t_com_err: t_com_err.o et1.o et2.o $(COM_ERR_DEPLIB) + $(CC_LINK) -o t_com_err t_com_err.o et1.o et2.o -lcom_err all-unix:: compile_et includes @@ -139,11 +146,12 @@ includes:: com_err.h clean-unix:: $(RM) $(BUILDTOP)/include/com_err.h +RUN_SETUP = @KRB5_RUN_ENV@ # test_et doesn't have an interesting exit status, but it'll exercise # some cases that t_com_err doesn't, so let's see if it crashes. check-unix:: t_com_err test_et - ./test_et - ./t_com_err + $(RUN_SETUP) ./test_et + $(RUN_SETUP) ./t_com_err # The real compile_et just isn't portable. (But then again, anything using # lex and yacc isn't portable by definition. :-( ) diff --git a/src/util/et/configure.in b/src/util/et/configure.in index ce8185495..b444b5f99 100644 --- a/src/util/et/configure.in +++ b/src/util/et/configure.in @@ -22,4 +22,6 @@ AC_HEADER_STDARG AC_CHECK_HEADERS(stdlib.h) KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY +KRB5_BUILD_PROGRAM dnl for test programs +KRB5_RUN_FLAGS dnl for test programs V5_AC_OUTPUT_MAKEFILE |