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/kadmin.v4 | |
| parent | 821ce16c47b36ff3f947fbe0773114bf5bdafc59 (diff) | |
| download | krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.gz krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.tar.xz krb5-b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91.zip | |
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/kadmin.v4')
| -rw-r--r-- | src/kadmin.v4/server/ChangeLog | 8 | ||||
| -rw-r--r-- | src/kadmin.v4/server/Makefile.in | 8 | ||||
| -rw-r--r-- | src/kadmin.v4/server/configure.in | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog index aa66d89e7d..b0e24ea586 100644 --- a/src/kadmin.v4/server/ChangeLog +++ b/src/kadmin.v4/server/ChangeLog @@ -1,3 +1,11 @@ + +Thu Jun 15 17:52:29 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, for K4, use KRB4_LIB and KRB4_CRYPTO_LIB, these were + split out. + * configure.in - Add shared library usage check. + Fri Jun 9 19:07:25 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/kadmin.v4/server/Makefile.in b/src/kadmin.v4/server/Makefile.in index b9d8b0f05f..0a1dcb453f 100644 --- a/src/kadmin.v4/server/Makefile.in +++ b/src/kadmin.v4/server/Makefile.in @@ -1,13 +1,13 @@ -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 DEPKDBLIB=$(TOPLIBD)/libkdb5.a -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) $(DBMLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) @@ -42,7 +42,7 @@ kadm_err.c: kadm_err.et kadm_err.h: kadm_err.et v4kadmind: $(OBJS) $(DEPLIBS) - $(CC) $(CFLAGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(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 1c51e02cda..39590cb8eb 100644 --- a/src/kadmin.v4/server/configure.in +++ b/src/kadmin.v4/server/configure.in @@ -11,4 +11,5 @@ CHECK_WAIT_TYPE CHECK_FCNTL CHECK_SIGNALS ET_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |