Shared library Makefile/configure changes and cleanup

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6069 dc483132-0cff-0310-8789-dd5450dbe970

36 files changed, 146 insertions, 59 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index c98a8ecc3e..fecd108fe9 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,14 @@
+
+Thu Jun 15 17:32:20 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.
+
 Sat Jun 10 22:56:10 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* forward.c, kcmd.c, krcp.c, krlogind.c, krshd.c:
diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 4f01dd5d22..2d78cd3718 100644
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -3,9 +3,9 @@ LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV
 SETENVSRC=@SETENVSRC@
 SETENVOBJ=@SETENVOBJ@
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KRB4_LIB = @KRB4_LIB@
-KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
+KLIB = -lkadm -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB)
+DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 LOGINLIBS = @LOGINLIBS@
 LIBOBJS=@LIBOBJS@
@@ -32,35 +32,35 @@ clean::
 	$(RM) rsh rcp rlogin krshd krlogind login.krb5
 
 rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) rsh $(DESTDIR)$(CLIENT_BINDIR)/rsh
 	$(INSTALL_DATA) $(srcdir)/rsh.M ${DESTDIR}$(CLIENT_MANDIR)/rsh.1
 
 rcp: krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) rcp $(DESTDIR)$(CLIENT_BINDIR)/rcp
 	$(INSTALL_DATA) $(srcdir)/rcp.M ${DESTDIR}$(CLIENT_MANDIR)/rcp.1
 
 rlogin: krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) rlogin $(DESTDIR)$(CLIENT_BINDIR)/rlogin
 	$(INSTALL_DATA) $(srcdir)/rlogin.M ${DESTDIR}$(CLIENT_MANDIR)/rlogin.1
 
 krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) krshd $(DESTDIR)$(SERVER_BINDIR)/krshd
 	$(INSTALL_DATA) $(srcdir)/krshd.M ${DESTDIR}$(SERVER_MANDIR)/krshd.8
 
 krlogind: krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind
@@ -71,7 +71,7 @@ install::
 # krb5_read_passwrd in krb5.a.  Sigh, circular references.
 #
 login.krb5: login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KLIB) $(LIBS) $(LOGINLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KLIB) $(LIBS) $(LOGINLIBS)
 
 install::
 	$(INSTALL_PROGRAM) login.krb5 $(DESTDIR)$(SERVER_BINDIR)/login.krb5
diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in
index e4a77e96c6..463a4345db 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -2,8 +2,6 @@ AC_INIT(krlogind.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 dnl dbm libs for use of an_to_ln
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
 AC_CHECK_LIB(util,main)
 AC_CHECK_LIB(crypt,crypt)
 dnl
@@ -136,4 +134,5 @@ dnl
 dnl
 ADD_DEF(-DKERBEROS)
 AC_CONST
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index ff12e31669..d8cf29f92d 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,10 @@
+
+Thu Jun 15 17:35:08 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 - Add shared library usage check.
+
 Sat Jun 10 19:06:03 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* gss-misc.c (recv_token): Initialize local variable to 0.
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index 65f6c07fa3..a04d03b21b 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,7 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
 
 SRCS= gss-client.c gss-misc.c gss-server.c
 
@@ -9,16 +8,15 @@ OBJS= gss-client.o gss-misc.o gss-server.o
 
 all:: gss-server gss-client
 
-KLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \
-		$(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lgssapi_krb5 -lkrb5 -lcrypto $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \
-		$(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+		$(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 gss-server: gss-server.o gss-misc.o $(DEPKLIB)
-	$(LD) $(CFLAGS) -o gss-server gss-server.o gss-misc.o $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o gss-server gss-server.o gss-misc.o $(KLIB) $(LIBS)
 
 gss-client: gss-client.o gss-misc.o $(DEPKLIB)
-	$(LD) $(CFLAGS) -o gss-client gss-client.o gss-misc.o $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o gss-client gss-client.o gss-misc.o $(KLIB) $(LIBS)
 
 gss-client.o:	$(srcdir)/gss-client.c
 
diff --git a/src/appl/gss-sample/configure.in b/src/appl/gss-sample/configure.in
index 108e2b9723..def5fa4383 100644
--- a/src/appl/gss-sample/configure.in
+++ b/src/appl/gss-sample/configure.in
@@ -4,4 +4,5 @@ AC_HAVE_HEADERS(unistd.h)
 AC_HEADER_CHECK(string.h,AC_DEFINE(USE_STRING_H))
 AC_CONST
 AC_PROG_INSTALL
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog
index 1b8b3e00ff..7789fadcfe 100644
--- a/src/appl/mailquery/ChangeLog
+++ b/src/appl/mailquery/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:36:11 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 22:57:11 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* poplib.c: krb5_auth_context redefinitions
diff --git a/src/appl/mailquery/Makefile.in b/src/appl/mailquery/Makefile.in
index 9af164eeee..8017aaf9f8 100644
--- a/src/appl/mailquery/Makefile.in
+++ b/src/appl/mailquery/Makefile.in
@@ -3,13 +3,13 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
 
 HESIODLIB =
 
 mailquery: mailquery.o poplib.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o mailquery mailquery.o poplib.o $(KLIB) \
+	$(LD) $(LDFLAGS) $(LDARGS) -o mailquery mailquery.o poplib.o $(KLIB) \
 		$(HESIODLIB) $(LIBS)
 
 mailquery.o:	$(srcdir)/mailquery.c
diff --git a/src/appl/mailquery/configure.in b/src/appl/mailquery/configure.in
index 98a36ea0ff..b49dfc0f2a 100644
--- a/src/appl/mailquery/configure.in
+++ b/src/appl/mailquery/configure.in
@@ -3,4 +3,5 @@ CONFIG_RULES
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(unistd.h stdlib.h)
 AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR))
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/movemail/ChangeLog b/src/appl/movemail/ChangeLog
index 90fb8aa6bc..9e46edd6c6 100644
--- a/src/appl/movemail/ChangeLog
+++ b/src/appl/movemail/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:37:08 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 22:57:39 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* movemail.c: krb5_auth_context redefinitions
diff --git a/src/appl/movemail/Makefile.in b/src/appl/movemail/Makefile.in
index f5a4399f75..fcbd2c6892 100644
--- a/src/appl/movemail/Makefile.in
+++ b/src/appl/movemail/Makefile.in
@@ -6,13 +6,13 @@ OBJS = movemail.o movemail-mmdf.o
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
 
 HESIODLIB = 
 
 movemail: movemail.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o movemail movemail.o $(KLIB) $(HESIODLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o movemail movemail.o $(KLIB) $(HESIODLIB) $(LIBS)
 
 all:: movemail
 
diff --git a/src/appl/movemail/configure.in b/src/appl/movemail/configure.in
index b9b250acc8..fd1fcce350 100644
--- a/src/appl/movemail/configure.in
+++ b/src/appl/movemail/configure.in
@@ -3,4 +3,5 @@ CONFIG_RULES
 AC_PROG_INSTALL
 CHECK_FCNTL
 AC_HAVE_HEADERS(unistd.h)
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog
index 6737c5c71b..7a422caa18 100644
--- a/src/appl/popper/ChangeLog
+++ b/src/appl/popper/ChangeLog
@@ -1,3 +1,12 @@
+
+Thu Jun 15 17:38:06 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 22:57:55 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* pop_init.c: krb5_auth_context redefinitions
diff --git a/src/appl/popper/Makefile.in b/src/appl/popper/Makefile.in
index 2df339b0f4..b35f3810e2 100644
--- a/src/appl/popper/Makefile.in
+++ b/src/appl/popper/Makefile.in
@@ -10,12 +10,11 @@ CFLAGS = $(CCOPTS) -DMAILDIR=\"/usr/spool/pop\" -DKERBEROS -DKRB5 -DDEBUG $(DEFS
 SERVER_MANSUFFIX = 8
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB) 
+DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
 
 OBJS		=	pop_dele.o pop_dropcopy.o pop_dropinfo.o \
 			pop_get_command.o pop_get_subcommand.o pop_init.o \
@@ -25,7 +24,7 @@ OBJS		=	pop_dele.o pop_dropcopy.o pop_dropinfo.o \
 			pop_user.o pop_xtnd.o pop_xmit.o popper.o
 
 popper: $(OBJS) $(DEPKLIB)
-	$(CC) $(CFLAGS) -o popper $(OBJS) $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o popper $(OBJS) $(KLIB) $(LIBS)
 
 all:: popper
 
diff --git a/src/appl/popper/configure.in b/src/appl/popper/configure.in
index 144c565542..23da3adb66 100644
--- a/src/appl/popper/configure.in
+++ b/src/appl/popper/configure.in
@@ -3,8 +3,6 @@ CONFIG_RULES
 AC_PROG_INSTALL
 AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAS_VSPRINTF))
 AC_CHECK_LIB(BSD,main)
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
 CHECK_WAIT_TYPE
 CHECK_FCNTL
 KRB5_POSIX_LOCKS
@@ -13,4 +11,5 @@ AC_HAVE_HEADERS(strings.h)
 AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))
 AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H))
 
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 596e284bcb..211bf0833d 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:38:55 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 22:58:15 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* sclient.c: krb5_auth_context redefinitions
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index d802a33c75..8651c01500 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -5,11 +5,11 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 sclient: sclient.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o sclient sclient.o $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(KLIB) $(LIBS)
 
 sclient.o:	$(srcdir)/sclient.c
 
diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 93af69e240..a7b6a4aecf 100644
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(sclient.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index c91b11fc98..d6bf4a7c41 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:39:17 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 22:58:40 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* sserver.c: krb5_auth_context redefinitions
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index d4ec7424af..ac59fd37fd 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,15 +1,15 @@
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_KRB5_LOG
 LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
+KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB) 
+DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
 
 sserver: sserver.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o sserver sserver.o $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(KLIB) $(LIBS)
 
 sserver.o:	$(srcdir)/sserver.c
 
diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index c8dee124d2..82a884d7a2 100644
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(sserver.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index 4ab149e75d..79b2c11f6e 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:39:54 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 22:58:57 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* sim_client.c: krb5_auth_context redefinitions
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 03e59f6c45..f6ac698a3d 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -2,17 +2,16 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB)
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
 sim_client: sim_client.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o sim_client sim_client.o $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sim_client sim_client.o $(KLIB) $(LIBS)
 
 sim_client.o:	$(srcdir)/sim_client.c
 
diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in
index f670061828..84cdeda393 100644
--- a/src/appl/simple/client/configure.in
+++ b/src/appl/simple/client/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(sim_client.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 7d688c8280..01c82416a9 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:40:51 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 22:59:20 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* sim_server.c: krb5_auth_context redefinitions
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 07e75fe0fd..5f4d33f4e8 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -2,17 +2,16 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB)
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 sim_server: sim_server.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o sim_server sim_server.o $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sim_server sim_server.o $(KLIB) $(LIBS)
 
 sim_server.o:	$(srcdir)/sim_server.c
 
diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in
index ee3b891cfb..8823e38eee 100644
--- a/src/appl/simple/server/configure.in
+++ b/src/appl/simple/server/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(sim_server.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index 9a89dd7043..f4ffef9a02 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,12 @@
+
+Thu Jun 15 17:41: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.
+
 Fri Jun  9 18:29:49 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 05039d277e..33423e6170 100644
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -26,8 +26,8 @@ LOCALINCLUDES=-I.. -I$(srcdir)/..
 CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KRB4_LIB = @KRB4_LIB@
-KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
+KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB)
 DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 SRCS=	commands.c main.c network.c ring.c \
@@ -43,7 +43,7 @@ OBJS=	authenc.o commands.o main.o network.o ring.o sys_bsd.o \
 all:: telnet
 
 telnet:	$(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a
-	$(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+	$(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
 
 clean::
 	$(RM) telnet
diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index f9d9ba2495..3bfbe660f5 100644
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -24,8 +24,6 @@ AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H))
 AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS))
 AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT))
 AC_FUNC_CHECK(setupterm,AC_DEFINE(HAS_SETUPTERM))
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
 CHECK_SIGNALS
 if test "$KRB4_LIB" = ''; then
 	AC_MSG_RESULT(No Kerberos 4 authentication)
@@ -33,4 +31,5 @@ else
 	AC_MSG_RESULT(Kerberos 4 authentication enabled)
 	AC_DEFINE(KRB4)
 fi
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 8c0a5bd094..6cc7cf1091 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,14 @@
+
+Thu Jun 15 17:43: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.
+
 Fri Jun  9 18:29:56 1995    <tytso@rsx-11.mit.edu>
 
 	* configure.in: Remove standardized set of autoconf macros, which
diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index f78338530b..0bc4f9b2c6 100644
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -26,9 +26,9 @@ LOCALINCLUDES=-I.. -I$(srcdir)/..
 CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-KRB4_LIB = @KRB4_LIB@
-KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
+KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@
+KLIB = -lkadm -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB)
+DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
 
 SRCS=	$(srcdir)/telnetd.c \
 	$(srcdir)/state.c \
@@ -52,7 +52,7 @@ OBJS=	telnetd.o \
 all:: telnetd
 
 telnetd: $(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a
-	$(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+	$(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
 
 clean::
 	$(RM) telnetd
diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index f1979d07b9..498f12f6b0 100644
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -1,8 +1,6 @@
 AC_INIT(telnetd.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-AC_CHECK_LIB(ndbm,main)
-AC_CHECK_LIB(dbm,main)
 AC_CHECK_LIB(util,main)
 AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP)
 LIBS="$LIBS -ltermcap")
@@ -41,4 +39,5 @@ AC_MSG_RESULT($krb5_cv_sys_setpgrp_two)
 if test $krb5_cv_sys_setpgrp_two = yes; then
   AC_DEFINE(SETPGRP_TWOARG)
 fi
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index a5d8c487cb..020fef29fb 100644
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,9 @@
+
+Thu Jun 15 17:44:23 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:05 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* client.c, server.c: krb5_auth_context redefinitions
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 4e523ce79c..b7ef965682 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -2,15 +2,14 @@ CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
 LDFLAGS = -g
 
 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-DBMLIB=
 
 all::
 
-KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB)
+KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
+DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
 
 uuclient: client.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o uuclient client.o $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o uuclient client.o $(KLIB) $(LIBS)
 
 client.o:	$(srcdir)/client.c
 
@@ -21,7 +20,7 @@ clean::
 	$(RM) client.o uuclient
 
 uuserver: server.o $(DEPKLIB)
-	$(CC) $(CFLAGS) -o uuserver server.o $(KLIB) $(LIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o uuserver server.o $(KLIB) $(LIBS)
 
 server.o:	$(srcdir)/server.c
 
diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in
index f41e2ca987..fe538ffe89 100644
--- a/src/appl/user_user/configure.in
+++ b/src/appl/user_user/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(client.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE