9 files changed, 38 insertions, 17 deletions
diff --git a/src/kadmin.old/client/ChangeLog b/src/kadmin.old/client/ChangeLog
index b22b641c8..1c11153ee 100644
--- a/src/kadmin.old/client/ChangeLog
+++ b/src/kadmin.old/client/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:49: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.
+	* configure.in - Add shared library usage check.
+
 Sat Jun 10 23:00:53 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* kadmin.c, kadmin_add.c, kadmin_apr.c, kadmin_cpr.c,
diff --git a/src/kadmin.old/client/Makefile.in b/src/kadmin.old/client/Makefile.in
index f11a25dfc..2b0adb75c 100644
--- a/src/kadmin.old/client/Makefile.in
+++ b/src/kadmin.old/client/Makefile.in
@@ -3,13 +3,12 @@ LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 SSLIB=$(BUILDTOP)/util/ss/libss.a
-DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a 
+KDBLIB=-lkdb5 
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) 
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) 
 
 SRCS = \
 	$(srcdir)/kadmin.c \
@@ -38,7 +37,7 @@ OBJS = \
 all::	kadmin
 
 kadmin: $(KDBDEPLIB) $(OBJS) $(DEPKLIB)
-	$(LD) $(CFLAGS) -o kadmin $(OBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kadmin $(OBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(C)kadmin ${DESTDIR}$(CLIENT_BINDIR)$(S)kadmin_old
diff --git a/src/kadmin.old/client/configure.in b/src/kadmin.old/client/configure.in
index 4230232e2..5448b0dfe 100644
--- a/src/kadmin.old/client/configure.in
+++ b/src/kadmin.old/client/configure.in
@@ -2,4 +2,5 @@ AC_INIT(kadmin.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 ET_RULES
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/kpasswd/ChangeLog b/src/kadmin.old/kpasswd/ChangeLog
index f7c80df89..427837690 100644
--- a/src/kadmin.old/kpasswd/ChangeLog
+++ b/src/kadmin.old/kpasswd/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:50:07 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.
+	* configure.in - Add shared library usage check.
+
 Sat Jun 10 23:02:12 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* kpasswd.c: krb5_auth_context redefinitions
diff --git a/src/kadmin.old/kpasswd/Makefile.in b/src/kadmin.old/kpasswd/Makefile.in
index 0225c55bd..33b3b0500 100644
--- a/src/kadmin.old/kpasswd/Makefile.in
+++ b/src/kadmin.old/kpasswd/Makefile.in
@@ -3,13 +3,12 @@ LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 SSLIB=$(BUILDTOP)/util/ss/libss.a
-DBMLIB=
-KDBLIB=$(TOPLIBD)/libkdb5.a 
+KDBLIB=-lkdb5 
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) 
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) 
 
 SRCS = \
 	$(srcdir)/networked.c \
@@ -23,7 +22,7 @@ OBJS = \
 all::	kpasswd
 
 kpasswd: $(KDBDEPLIB) $(OBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(C)kpasswd ${DESTDIR}$(CLIENT_BINDIR)$(S)kpasswd_old
diff --git a/src/kadmin.old/kpasswd/configure.in b/src/kadmin.old/kpasswd/configure.in
index 457c7908f..6638e994b 100644
--- a/src/kadmin.old/kpasswd/configure.in
+++ b/src/kadmin.old/kpasswd/configure.in
@@ -5,4 +5,5 @@ AC_HAVE_HEADERS(unistd.h stdlib.h)
 CHECK_UTMP
 AC_FUNC_CHECK(getutent,AC_DEFINE(HAVE_GETUTENT))
 ET_RULES
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog
index a8189e6ad..0a9bbbff3 100644
--- a/src/kadmin.old/server/ChangeLog
+++ b/src/kadmin.old/server/ChangeLog
@@ -1,3 +1,12 @@
+
+Thu Jun 15 17:51:04 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.
+
 Sat Jun 10 23:02:30 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* adm_adm_func.c, adm_extern.h, adm_funcs.c, adm_kadmin.c,
diff --git a/src/kadmin.old/server/Makefile.in b/src/kadmin.old/server/Makefile.in
index d09b40b7c..da2109ff8 100644
--- a/src/kadmin.old/server/Makefile.in
+++ b/src/kadmin.old/server/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 
+KDBLIB=-lkdb5 
 DEPKDBLIB=$(TOPLIBD)/libkdb5.a 
+KADMLIB=-lkadm
+DEPKADMLIB=$(TOPLIBD)/libkadm.a
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB)
+KLIB = $(KADMLIB) -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB)
+DEPKLIB = $(DEPKADMLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB)
 
 DEPLIBS = $(DEPKDBLIB) $(DEPKLIB)
 LOCAL_LIBRARIES = $(KDBLIB) $(KLIB)
@@ -51,7 +52,7 @@ OBJS = \
 all::	kadmind
 
 kadmind: $(KDBDEPLIB) $(OBJS) $(DEPLIBS)
-	$(LD) $(CFLAGS) -o kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(C)kadmind ${DESTDIR}$(SERVER_BINDIR)$(S)kadmind_old
diff --git a/src/kadmin.old/server/configure.in b/src/kadmin.old/server/configure.in
index 9e7606828..8b56f8cee 100644
--- a/src/kadmin.old/server/configure.in
+++ b/src/kadmin.old/server/configure.in
@@ -1,10 +1,9 @@
 AC_INIT(adm_kadmin.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
 HAS_ANSI_VOLATILE
 AC_TIME_WITH_SYS_TIME
 ET_RULES
 CHECK_SIGPROCMASK
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE