diff options
| author | Paul Park <pjpark@mit.edu> | 1995-07-07 20:58:36 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-07-07 20:58:36 +0000 |
| commit | f5feac72367bbaf855c57696036063ef150ce9b2 (patch) | |
| tree | d9ebac64d0e6562ab56863ae0d0437010d6e17b8 /src/kadmin.v4 | |
| parent | 0e6ce6fec56ac88099d08622864877f923b84163 (diff) | |
| download | krb5-f5feac72367bbaf855c57696036063ef150ce9b2.zip krb5-f5feac72367bbaf855c57696036063ef150ce9b2.tar.gz krb5-f5feac72367bbaf855c57696036063ef150ce9b2.tar.bz2 | |
Reorganize library logic and use LDFLAGS from configure
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6250 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin.v4')
| -rw-r--r-- | src/kadmin.v4/server/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin.v4/server/Makefile.in | 14 | ||||
| -rw-r--r-- | src/kadmin.v4/server/configure.in | 3 |
3 files changed, 9 insertions, 13 deletions
diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog index a74a3e1..9cf6d7f 100644 --- a/src/kadmin.v4/server/ChangeLog +++ b/src/kadmin.v4/server/ChangeLog @@ -1,4 +1,9 @@ +Fri Jul 7 16:05:11 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove all explicit library handling and LDFLAGS. + * configure.in - Add USE_<mumble> and KRB5_LIBRARIES. + + Tue Jun 27 16:05:27 EDT 1995 Paul Park (pjpark@mit.edu) * acl_files.c - Change check for return value from fputs(3) from NULL to EOF. That's what's returned on error. diff --git a/src/kadmin.v4/server/Makefile.in b/src/kadmin.v4/server/Makefile.in index 0a1dcb4..39c13ee 100644 --- a/src/kadmin.v4/server/Makefile.in +++ b/src/kadmin.v4/server/Makefile.in @@ -1,16 +1,4 @@ -KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -LDFLAGS = -g - -COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= -KDBLIB=-lkdb5 -DEPKDBLIB=$(TOPLIBD)/libkdb5.a - -KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) - -DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV -I. @@ -42,7 +30,7 @@ kadm_err.c: kadm_err.et kadm_err.h: kadm_err.et v4kadmind: $(OBJS) $(DEPLIBS) - $(LD) $(LDFLAGS) $(LDARGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o v4kadmind $(OBJS) $(LIBS) install:: $(INSTALL_PROGRAM) v4kadmind ${DESTDIR}$(SERVER_BINDIR)/v4kadmind diff --git a/src/kadmin.v4/server/configure.in b/src/kadmin.v4/server/configure.in index 3605d9c..47fffc7 100644 --- a/src/kadmin.v4/server/configure.in +++ b/src/kadmin.v4/server/configure.in @@ -13,5 +13,8 @@ CHECK_WAIT_TYPE CHECK_FCNTL CHECK_SIGNALS ET_RULES +USE_KDB5_LIBRARY +USE_KRB4_LIBRARY +KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |