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/v5server | |
| 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/v5server')
| -rw-r--r-- | src/kadmin/v5server/ChangeLog | 9 | ||||
| -rw-r--r-- | src/kadmin/v5server/Makefile.in | 13 | ||||
| -rw-r--r-- | src/kadmin/v5server/configure.in | 3 |
3 files changed, 17 insertions, 8 deletions
diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog index c2cb92393..252475a81 100644 --- a/src/kadmin/v5server/ChangeLog +++ b/src/kadmin/v5server/ChangeLog @@ -1,3 +1,12 @@ + +Thu Jun 15 17:54:31 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. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Wed Jun 14 17:19:09 1995 Sam Hartman <hartmans@tardis.MIT.EDU> * srv_acl.c (acl_get_line): Check to make sure we haven't exceeded diff --git a/src/kadmin/v5server/Makefile.in b/src/kadmin/v5server/Makefile.in index 46479d8f0..bde3cb18e 100644 --- a/src/kadmin/v5server/Makefile.in +++ b/src/kadmin/v5server/Makefile.in @@ -3,14 +3,15 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a SSLIB=$(BUILDTOP)/util/ss/libss.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a -KADMLIB=$(TOPLIBD)/libkadm.a +KDBLIB=-lkdb5 +DEPKDBLIB=$(TOPLIBD)/libkdb5.a +KADMLIB=-lkadm +DEPKADMLIB=$(TOPLIBD)/libkadm.a all:: -KLIB = $(KADMLIB) $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(KADMLIB) $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) +KLIB = $(KADMLIB) $(KDBLIB) -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) +DEPKLIB = $(DEPKADMLIB) $(DEPKDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) SRCS = \ $(srcdir)/srv_main.c $(srcdir)/srv_key.c \ @@ -25,7 +26,7 @@ OBJS = \ all:: kadmind5 kadmind5: $(KDBDEPLIB) $(OBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o kadmind5 $(OBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kadmind5 $(OBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) $(C)kadmind5 ${DESTDIR}$(SERVER_BINDIR)$(S)kadmind5 diff --git a/src/kadmin/v5server/configure.in b/src/kadmin/v5server/configure.in index 1c6363a82..3919a5702 100644 --- a/src/kadmin/v5server/configure.in +++ b/src/kadmin/v5server/configure.in @@ -1,8 +1,6 @@ AC_INIT(srv_main.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) AC_FUNC_CHECK(waitpid,AC_DEFINE(HAVE_WAITPID)) AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAVE_VSPRINTF)) AC_CHECK_HEADERS(sys/select.h) @@ -10,4 +8,5 @@ CHECK_SIGNALS CHECK_SETJMP CHECK_WAIT_TYPE ET_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE |