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/v4server | |
| parent | 647d10f2b8efd96a47ce5864f685b17cc7705f9f (diff) | |
Merge of libhack_branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/v4server')
| -rw-r--r-- | src/kadmin/v4server/ChangeLog | 9 | ||||
| -rw-r--r-- | src/kadmin/v4server/Makefile.in | 10 | ||||
| -rw-r--r-- | src/kadmin/v4server/configure.in | 9 |
3 files changed, 16 insertions, 12 deletions
diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog index 2966ad100..c05b4a2f3 100644 --- a/src/kadmin/v4server/ChangeLog +++ b/src/kadmin/v4server/ChangeLog @@ -1,3 +1,12 @@ +Thu Feb 6 14:49:45 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> + + * Makefile.in (LOCALINCLUDE): Repair lack of -I. and -I$(srcdir) + +Tue Feb 4 21:23:16 1997 Tom Yu <tlyu@mit.edu> + + * Makefile.in: + * configure.in: Update to new program build procedure. + Fri Nov 22 15:49:27 1996 unknown <bjaspan@mit.edu> * kadm_ser_wrap.c (endif ): use sizeof instead of h_length to diff --git a/src/kadmin/v4server/Makefile.in b/src/kadmin/v4server/Makefile.in index b1c5c90a7..ae99b3573 100644 --- a/src/kadmin/v4server/Makefile.in +++ b/src/kadmin/v4server/Makefile.in @@ -1,7 +1,9 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) \ -DOVSEC_KADM -DUSE_KADM5_API_VERSION=1 -DNEED_SOCKETS +PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) +PROG_RPATH=$(KRB5_LIBDIR) -LOCALINCLUDE = -I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV -I. +LOCALINCLUDE = $(KRB4_INCLUDES) -I. -I$(srcdir) PROG = kadmind4 OBJS = kadm_server.o admin_server.o kadm_ser_wrap.o \ @@ -9,12 +11,12 @@ OBJS = kadm_server.o admin_server.o kadm_ser_wrap.o \ all:: $(PROG) -kadm_err.c kadm_err.h: $(srcdir)/kadm_err.et +kadm_err.c kadm_err.h: kadm_err.et $(OBJS): kadm_err.h -$(PROG): $(OBJS) $(DEPLIBS) - $(CC) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(LIBS) +$(PROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(DB_DEPLIB) $(KRB4COMPAT_DEPLIBS) + $(CC_LINK) -o $(PROG) $(OBJS) $(KADMCLNT_LIBS) $(DB_LIB) $(KRB4COMPAT_LIBS) install:: $(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG) diff --git a/src/kadmin/v4server/configure.in b/src/kadmin/v4server/configure.in index 96f3653c2..9af805d9b 100644 --- a/src/kadmin/v4server/configure.in +++ b/src/kadmin/v4server/configure.in @@ -6,12 +6,5 @@ AC_CHECK_HEADERS(sys/time.h unistd.h stdlib.h) CHECK_SIGNALS CHECK_WAIT_TYPE AC_PROG_AWK -USE_KADMCLNT_LIBRARY -USE_GSSRPC_LIBRARY -USE_GSSAPI_LIBRARY -USE_DYN_LIBRARY -USE_KDB5_LIBRARY -USE_KRB4_LIBRARY -KRB5_LIBRARIES -V5_USE_SHARED_LIB +KRB5_BUILD_PROGRAM V5_AC_OUTPUT_MAKEFILE |