From b3e348a072ba88a2ae1b28ed58dc0b5249b9cb91 Mon Sep 17 00:00:00 2001
From: Paul Park <pjpark@mit.edu>
Date: Thu, 15 Jun 1995 22:34:56 +0000
Subject: Shared library Makefile/configure changes and cleanup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6069 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/admin/convert/ChangeLog    | 8 ++++++++
 src/admin/convert/Makefile.in  | 8 ++++----
 src/admin/convert/configure.in | 1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/admin/convert')

diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog
index f90678126..406bb5bb0 100644
--- a/src/admin/convert/ChangeLog
+++ b/src/admin/convert/ChangeLog
@@ -1,3 +1,11 @@
+
+Thu Jun 15 15:27:36 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 wer
+		split out.
+	* configure.in - Add shared library usage check.
+
 Fri Jun  9 18:14:06 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in
index 78f8200b9..f23609805 100644
--- a/src/admin/convert/Makefile.in
+++ b/src/admin/convert/Makefile.in
@@ -1,4 +1,4 @@
-KRB4_LIB = @KRB4_LIB@
+KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
 KDB4_LIB = @KDB4_LIB@
 
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
@@ -6,12 +6,12 @@ LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a
+KDBLIB=-lkdb5
 DEPKDBLIB=$(TOPLIBD)/libkdb5.a
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
 
 
@@ -22,7 +22,7 @@ LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV
 all:: kdb5_convert
 
 kdb5_convert: kdb5_convert.o $(DEPLIBS)
-	$(CC) $(CFLAGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert
diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in
index 31197bd2c..77b90e890 100644
--- a/src/admin/convert/configure.in
+++ b/src/admin/convert/configure.in
@@ -3,4 +3,5 @@ CONFIG_RULES
 AC_PROG_INSTALL
 AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
-- 
cgit