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/krb524 | |
| parent | 647d10f2b8efd96a47ce5864f685b17cc7705f9f (diff) | |
| download | krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.zip krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.gz krb5-561f2cdd8613f26d7de48c567b603e8c06fe7e5a.tar.bz2 | |
Merge of libhack_branch
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9831 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/krb524')
| -rw-r--r-- | src/krb524/ChangeLog | 8 | ||||
| -rw-r--r-- | src/krb524/Makefile.in | 23 | ||||
| -rw-r--r-- | src/krb524/configure.in | 13 |
3 files changed, 22 insertions, 22 deletions
diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 7f5856d..36395fe 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,11 @@ +Tue Feb 4 20:13:37 1997 Tom Yu <tlyu@mit.edu> + + * Makefile.in: Fix up krb4 library handling properly (hopefully). + +Sun Feb 2 10:06:22 1997 Ezra Peisach <epeisach@mit.edu> + + * configure.in, Makefile.in: Update to new build system rules + Thu Dec 5 23:27:00 1996 Tom Yu <tlyu@mit.edu> * krb524d.c (main): Ignore SIGHUP for now. [27] diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index df73986..802d956 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -20,15 +20,15 @@ # CFLAGS = $(CCOPTS) -DUSE_MASTER $(DEFS) $(LOCALINCLUDE) +PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) +PROG_RPATH=$(KRB5_LIBDIR) all:: +KRB524_DEPLIB = libkrb524.a +KRB524_LIB = libkrb524.a -LOCAL_LIBRARIES = libkrb524.a -DEPLOCAL_LIBRARIES = libkrb524.a - -LOCALINCLUDE= -I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV \ - -I. -I$(srcdir) +LOCALINCLUDE= $(KRB4_INCLUDES) -I. -I$(srcdir) # Library sources SRCS = conv_creds.c conv_princ.c conv_tkt.c cnv_tkt_skey.c \ @@ -44,14 +44,14 @@ libkrb524.a: $(OBJS) $(ARADD) $@ $(OBJS) $(RANLIB) $@ -krb524test: libkrb524.a test.o $(DEPLIBS) - $(LD) -o krb524test $(LDFLAGS) $(LDARGS) test.o $(LIBS) +krb524test: libkrb524.a test.o $(KRB524_DEPLIB) $(KRB4COMPAT_DEPLIBS) + $(CC_LINK) -o krb524test test.o $(KRB524_LIB) $(KRB4COMPAT_LIBS) -krb524d: krb524d.o $(DEPLIBS) - $(LD) -o krb524d krb524d.o $(LDFLAGS) $(LDARGS) $(LIBS) +krb524d: krb524d.o $(KADMSRV_DEPLIBS) $(KRB524_DEPLIB) $(KRB4COMPAT_DEPLIBS) + $(CC_LINK) -o krb524d krb524d.o $(KADMSRV_LIBS) $(KRB524_LIB) $(KRB4COMPAT_LIBS) -k524init: k524init.o $(DEPLIBS) - $(LD) -o k524init $(LDFLAGS) $(LDARGS) k524init.o $(LIBS) +k524init: k524init.o $(KRB524_DEPLIB) $(KRB4COMPAT_DEPLIBS) + $(CC_LINK) -o k524init k524init.o $(KRB524_LIB) $(KRB4COMPAT_LIBS) install:: $(INSTALL_DATA) libkrb524.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb524.a @@ -62,4 +62,3 @@ install:: clean:: $(RM) libkrb524.a $(OBJS) $(GENS) core *~ *.bak #* $(RM) krb524test krb524d k524init test.o krb524d.o k524init.o - diff --git a/src/krb524/configure.in b/src/krb524/configure.in index fe92f9b..bf967c1 100644 --- a/src/krb524/configure.in +++ b/src/krb524/configure.in @@ -5,15 +5,8 @@ AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB AC_PROG_INSTALL AC_PROG_AWK -AC_TYPE_SIGNAL -USE_KADMSRV_LIBRARY -USE_GSSRPC_LIBRARY -USE_GSSAPI_LIBRARY -USE_DYN_LIBRARY -USE_DB_LIBRARY -USE_KDB5_LIBRARY -USE_KRB4_LIBRARY -KRB5_LIBRARIES -V5_USE_SHARED_LIB AC_CHECK_HEADERS(sys/select.h) dnl +AC_TYPE_SIGNAL + +KRB5_BUILD_PROGRAM V5_AC_OUTPUT_MAKEFILE |