diff options
| author | Paul Park <pjpark@mit.edu> | 1995-06-15 22:34:56 +0000 |
|---|---|---|
| committer | Paul Park <pjpark@mit.edu> | 1995-06-15 22:34:56 +0000 |
| commit | b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91 (patch) | |
| tree | 40f4f5b31ddbca1f791d2f080e3da04cf3bcc109 /src/kdc | |
| parent | 821ce16c47b36ff3f947fbe0773114bf5bdafc59 (diff) | |
Shared library Makefile/configure changes and cleanup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6069 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc')
| -rw-r--r-- | src/kdc/ChangeLog | 11 | ||||
| -rw-r--r-- | src/kdc/Makefile.in | 15 | ||||
| -rw-r--r-- | src/kdc/configure.in | 3 |
3 files changed, 20 insertions, 9 deletions
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index b23d1ac71..286d9b98c 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,14 @@ + +Thu Jun 15 17:55:21 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. Also, for K4, use + KRB4_LIB and KRB4_CRYPTO_LIB, these were + split out. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Tue Jun 13 12:44:20 1995 Sam Hartman <hartmans@tardis.MIT.EDU> * network.c: Base inclusion of sys/select.h on whether it exists diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index dda9be6f2..0ad336dcc 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -1,22 +1,23 @@ -KRB4_LIB = @KRB4_LIB@ +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 KDBDEPLIB=$(TOPLIBD)/libkdb5.a -KADMLIB=$(TOPLIBD)/libkadm.a +KADMLIB=-lkadm KADMDEPLIB=$(TOPLIBD)/libkadm.a -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) KRB4INCLUDES=-I$(SRCTOP)/include/kerberosIV all:: +DEFINES = -DBACKWARD_COMPAT $(KRB4DEF) + LOCALINCLUDE = $(KRB4INCLUDES) -I. SRCS= \ kdc5_err.c \ @@ -55,7 +56,7 @@ kdc5_err.h: kdc5_err.et kdc5_err.o: kdc5_err.h krb5kdc: $(OBJS) $(KDBDEPLIB) $(DEPKLIB) $(KADMDEPLIB) - $(LD) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KADMLIB) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KADMLIB) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc diff --git a/src/kdc/configure.in b/src/kdc/configure.in index 154fd0ba6..73f2af68b 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -1,10 +1,9 @@ AC_INIT(main.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS))) AC_CHECK_HEADERS(sys/select.h) ET_RULES HAS_ANSI_VOLATILE +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |