diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-02-09 17:43:52 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-02-09 17:43:52 +0000 |
| commit | 561f2cdd8613f26d7de48c567b603e8c06fe7e5a (patch) | |
| tree | 4165fe26da185697068044d1fba17cb15d5b19bc /src/lib/rpc/unit-test | |
| parent | 647d10f2b8efd96a47ce5864f685b17cc7705f9f (diff) | |
| download | krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.gz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.xz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.zip | |
Merge of libhack_branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/rpc/unit-test')
| -rw-r--r-- | src/lib/rpc/unit-test/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/rpc/unit-test/Makefile.in | 12 | ||||
| -rw-r--r-- | src/lib/rpc/unit-test/configure.in | 9 |
3 files changed, 15 insertions, 11 deletions
diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index 0303efb29..5bc39f23a 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 6 15:58:52 1997 Tom Yu <tlyu@mit.edu> + + * Makefile.in: + * configure.in: Update to new program build procedure. + Wed Nov 20 16:00:21 1996 Barry Jaspan <bjaspan@mit.edu> * Makefile.in (unit-test-): warn more loudly about unrun tests diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in index 26c10c79d..dfccd7e68 100644 --- a/src/lib/rpc/unit-test/Makefile.in +++ b/src/lib/rpc/unit-test/Makefile.in @@ -1,14 +1,18 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I. +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) OBJS= client.o rpc_test_clnt.o rpc_test_svc.o server.o all:: client server -client: client.o rpc_test_clnt.o $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o client client.o rpc_test_clnt.o $(LIBS) +client: client.o rpc_test_clnt.o $(GSSRPC_DEPLIBS) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o client client.o rpc_test_clnt.o \ + $(GSSRPC_LIBS) $(KRB5_BASE_LIBS) -server: server.o rpc_test_svc.o $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o server server.o rpc_test_svc.o $(LIBS) +server: server.o rpc_test_svc.o $(GSSRPC_DEPLIBS) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o server server.o rpc_test_svc.o \ + $(GSSRPC_LIBS) $(KRB5_BASE_LIBS) client.o server.o: rpc_test.h diff --git a/src/lib/rpc/unit-test/configure.in b/src/lib/rpc/unit-test/configure.in index 6e100a213..3f5514701 100644 --- a/src/lib/rpc/unit-test/configure.in +++ b/src/lib/rpc/unit-test/configure.in @@ -6,15 +6,10 @@ dnl The following are tests for the presence of programs required for testing AC_CHECK_PROG(RUNTEST,runtest,runtest) AC_CHECK_PROG(PERL,perl,perl) AC_KRB5_TCL -if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIB" != ""; then +if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then DO_TEST=ok fi AC_SUBST(DO_TEST) dnl -USE_GSSRPC_LIBRARY -USE_GSSAPI_LIBRARY -USE_DYN_LIBRARY -V5_USE_SHARED_LIB -KRB5_LIBRARIES - +KRB5_BUILD_PROGRAM V5_AC_OUTPUT_MAKEFILE |