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/kadmin/server | |
| 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/kadmin/server')
| -rw-r--r-- | src/kadmin/server/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/server/Makefile.in | 7 | ||||
| -rw-r--r-- | src/kadmin/server/configure.in | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index 23897964a..e36f94d8c 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 4 20:59:31 1997 Tom Yu <tlyu@mit.edu> + + * Makefile.in: + * configure.in: Update to new program build procedure. + Wed Dec 4 15:29:30 1996 Barry Jaspan <bjaspan@mit.edu> * ovsec_kadmd.c (main): fix duplicated error strings diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in index d61737d20..5ce41d0fe 100644 --- a/src/kadmin/server/Makefile.in +++ b/src/kadmin/server/Makefile.in @@ -1,12 +1,15 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) +PROG_LIBPATH=-L$(TOPLIBD) +PROG_RPATH=$(KRB5_LIBDIR) + PROG = kadmind OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o misc.o server_glue_v1.o all:: $(PROG) -$(PROG): $(OBJS) $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(LIBS) +$(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS) + $(CC_LINK) -o $(PROG) $(OBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS) install:: $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) diff --git a/src/kadmin/server/configure.in b/src/kadmin/server/configure.in index 98492f909..17d9f9009 100644 --- a/src/kadmin/server/configure.in +++ b/src/kadmin/server/configure.in @@ -7,11 +7,5 @@ dnl CHECK_SIGNALS dnl CHECK_SETJMP dnl CHECK_WAIT_TYPE dnl ET_RULES -USE_KADMSRV_LIBRARY -USE_GSSRPC_LIBRARY -USE_GSSAPI_LIBRARY -USE_KDB5_LIBRARY -USE_DYN_LIBRARY -KRB5_LIBRARIES -V5_USE_SHARED_LIB +KRB5_BUILD_PROGRAM V5_AC_OUTPUT_MAKEFILE |