Reorganize library logic and use LDFLAGS from configure

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

36 files changed, 124 insertions, 100 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 4b03944c1..fec8229b8 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:40:42 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explcitit library handling.
+	* configure.in - Add USE_<mumble> and KRB5_LIBRARIES.
+
 Wed Jul  5 20:03:37 1995  Theodore Y. Ts'o  (tytso@dcl)
 
 	* krcp.c, krlogin.c, krlogind.c, krshd.c, login.c: Remove
diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index 2d78cd371..3445ee415 100644
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -2,10 +2,6 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DEFINES)
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV
 SETENVSRC=@SETENVSRC@
 SETENVOBJ=@SETENVOBJ@
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-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@
@@ -31,36 +27,36 @@ all:: rsh rcp rlogin krshd krlogind login.krb5
 clean:: 
 	$(RM) rsh rcp rlogin krshd krlogind login.krb5
 
-rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(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)
-	$(LD) $(LDFLAGS) $(LDARGS) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+rcp: krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(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)
-	$(LD) $(LDFLAGS) $(LDARGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+rlogin: krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(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)
-	$(LD) $(LDFLAGS) $(LDARGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(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)
-	$(LD) $(LDFLAGS) $(LDARGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS)
+krlogind: krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
 
 install::
 	$(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind
@@ -70,8 +66,8 @@ install::
 # We load the libraries twice here since des425 has a dependency on 
 # krb5_read_passwrd in krb5.a.  Sigh, circular references.
 #
-login.krb5: login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KLIB) $(LIBS) $(LOGINLIBS)
+login.krb5: login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(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 c12df133d..b68eeb59f 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -154,5 +154,8 @@ dnl
 dnl
 ADD_DEF(-DKERBEROS)
 AC_CONST
+USE_KADM_LIBRARY
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index d8cf29f92..bb2ec0d8b 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:41:47 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling.
+	* configure.in - Add KRB5_LIBRARIES.
+
+
 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.
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index a04d03b21..12ee366e5 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,22 +1,19 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-
 SRCS= gss-client.c gss-misc.c gss-server.c
 
 OBJS= gss-client.o gss-misc.o gss-server.o
 
 all:: gss-server gss-client
 
-KLIB = -lgssapi_krb5 -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \
-		$(TOPLIBD)/libcrypto.a $(COMERRLIB)
+LOCAL_LIBRARIES = -lgssapi_krb5
+DEPLOCAL_LIBRARIES = $(TOPLIBD)/gssapi/libgssapi_krb5.a
 
-gss-server: gss-server.o gss-misc.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o gss-server gss-server.o gss-misc.o $(KLIB) $(LIBS)
+gss-server: gss-server.o gss-misc.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o gss-server gss-server.o gss-misc.o $(LIBS)
 
-gss-client: gss-client.o gss-misc.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o gss-client gss-client.o gss-misc.o $(KLIB) $(LIBS)
+gss-client: gss-client.o gss-misc.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o gss-client gss-client.o gss-misc.o $(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 def5fa438..5987e3afd 100644
--- a/src/appl/gss-sample/configure.in
+++ b/src/appl/gss-sample/configure.in
@@ -4,5 +4,6 @@ AC_HAVE_HEADERS(unistd.h)
 AC_HEADER_CHECK(string.h,AC_DEFINE(USE_STRING_H))
 AC_CONST
 AC_PROG_INSTALL
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog
index 8ecca7dc4..46bf2e886 100644
--- a/src/appl/mailquery/ChangeLog
+++ b/src/appl/mailquery/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:43:24 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling.
+	* configure.in - Add KRB5_LIBRARIES.
+
 Tue Jun 20 14:29:23 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* poplib.c: HAS_STDLIB_H -> HAVE_STDLIB_H
diff --git a/src/appl/mailquery/Makefile.in b/src/appl/mailquery/Makefile.in
index 8017aaf9f..eb740403e 100644
--- a/src/appl/mailquery/Makefile.in
+++ b/src/appl/mailquery/Makefile.in
@@ -1,16 +1,13 @@
 CFLAGS = $(CCOPTS) -DKPOP -DKRB5 $(DEFS) $(LOCALINCLUDE)
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
 HESIODLIB =
+LOCAL_LIBRARIES = $(HESIODLIB)
+DEPLOCAL_LIBRARIES = $(HESIODLIB)
 
-mailquery: mailquery.o poplib.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o mailquery mailquery.o poplib.o $(KLIB) \
-		$(HESIODLIB) $(LIBS)
+mailquery: mailquery.o poplib.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o mailquery mailquery.o poplib.o $(LIBS)
 
 mailquery.o:	$(srcdir)/mailquery.c
 poplib.o:	$(srcdir)/poplib.c
diff --git a/src/appl/mailquery/configure.in b/src/appl/mailquery/configure.in
index b49dfc0f2..c93e62d34 100644
--- a/src/appl/mailquery/configure.in
+++ b/src/appl/mailquery/configure.in
@@ -3,5 +3,6 @@ CONFIG_RULES
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(unistd.h stdlib.h)
 AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR))
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/movemail/ChangeLog b/src/appl/movemail/ChangeLog
index bbf68952f..4ab3f22f1 100644
--- a/src/appl/movemail/ChangeLog
+++ b/src/appl/movemail/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:44:13 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - add KRB5_LIBRARIES.
+
 Tue Jun 20 13:09:51 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* movemail.c: USE_STRING_H -> HAVE_STRING_H; fix HAVE_STLIB_H to
diff --git a/src/appl/movemail/Makefile.in b/src/appl/movemail/Makefile.in
index fcbd2c689..838b42d00 100644
--- a/src/appl/movemail/Makefile.in
+++ b/src/appl/movemail/Makefile.in
@@ -1,18 +1,15 @@
 CFLAGS = $(CCOPTS) -DKERBEROS -DKRB5 -DMAIL_USE_POP $(DEFS) $(LOCALINCLUDE)
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-LDFLAGS = -g
 
 OBJS = movemail.o movemail-mmdf.o
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
 HESIODLIB = 
+LOCAL_LIBRARIES = $(HESIODLIB)
+DEPLOCAL_LIBRARIES = $(HESIODLIB)
 
-movemail: movemail.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o movemail movemail.o $(KLIB) $(HESIODLIB) $(LIBS)
+movemail: movemail.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o movemail movemail.o $(LIBS)
 
 all:: movemail
 
diff --git a/src/appl/movemail/configure.in b/src/appl/movemail/configure.in
index f6e246920..c23366526 100644
--- a/src/appl/movemail/configure.in
+++ b/src/appl/movemail/configure.in
@@ -3,5 +3,6 @@ CONFIG_RULES
 AC_PROG_INSTALL
 CHECK_FCNTL
 AC_HAVE_HEADERS(stdlib.h string.h unistd.h)
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog
index 7a422caa1..8f533d318 100644
--- a/src/appl/popper/ChangeLog
+++ b/src/appl/popper/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:44:56 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling.
+	* configure.in - add USE_KADM_LIBRARY and KRB5_LIBRARIES.
+
+
 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.
diff --git a/src/appl/popper/Makefile.in b/src/appl/popper/Makefile.in
index b35f3810e..5d36a0172 100644
--- a/src/appl/popper/Makefile.in
+++ b/src/appl/popper/Makefile.in
@@ -9,13 +9,8 @@ CFLAGS = $(CCOPTS) -DMAILDIR=\"/usr/spool/pop\" -DKERBEROS -DKRB5 -DDEBUG $(DEFS
 
 SERVER_MANSUFFIX = 8
 
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
-
 all::
 
-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 \
 			pop_last.o pop_list.o pop_log.o pop_lower.o \
@@ -23,8 +18,8 @@ OBJS		=	pop_dele.o pop_dropcopy.o pop_dropinfo.o \
 			pop_rset.o pop_send.o pop_stat.o pop_updt.o \
 			pop_user.o pop_xtnd.o pop_xmit.o popper.o
 
-popper: $(OBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o popper $(OBJS) $(KLIB) $(LIBS)
+popper: $(OBJS) $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o popper $(OBJS) $(LIBS)
 
 all:: popper
 
diff --git a/src/appl/popper/configure.in b/src/appl/popper/configure.in
index 23da3adb6..73234293a 100644
--- a/src/appl/popper/configure.in
+++ b/src/appl/popper/configure.in
@@ -11,5 +11,7 @@ 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))
 
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index 435b8fce1..b46458339 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:46:11 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add KRB5_LIBRARIES.
+
 Tue Jun 20 13:16:10 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* configure.in: added missing check for stdlib.h
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 8651c0150..40587b20e 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,15 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-sclient: sclient.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(KLIB) $(LIBS)
+sclient: sclient.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(LIBS)
 
 sclient.o:	$(srcdir)/sclient.c
 
diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 02ecb6514..3683371e7 100644
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/configure.in
@@ -2,5 +2,6 @@ AC_INIT(sclient.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_CHECK_HEADERS(stdlib.h)
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index d6bf4a7c4..bee241769 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:47:04 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add KRB5_LIBRARIES and USE_KADM_LIBRARY.
+
+
 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.
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 92eb2cdeb..84e6a0e58 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,15 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
-sserver: sserver.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(KLIB) $(LIBS)
+sserver: sserver.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(LIBS)
 
 sserver.o:	$(srcdir)/sserver.c
 
diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index 82a884d7a..c0089c397 100644
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/configure.in
@@ -1,5 +1,7 @@
 AC_INIT(sserver.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index c07b9e9f8..321938a22 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:48:14 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add KRB5_LIBRARIES.
+
 Wed Jun 28 13:27:17 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* sim_client.c: Include stdlib.h or declare malloc.
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index f6ac698a3..0424a3ee4 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,17 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
-sim_client: sim_client.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sim_client sim_client.o $(KLIB) $(LIBS)
+sim_client: sim_client.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sim_client sim_client.o $(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 ce69ddf9b..657e99f36 100644
--- a/src/appl/simple/client/configure.in
+++ b/src/appl/simple/client/configure.in
@@ -2,5 +2,6 @@ AC_INIT(sim_client.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_CHECK_HEADERS(stdlib.h)
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 5e4942713..5d0cbc129 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:48:58 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove all explicit library handling and LDFLAGS.
+	* configure.in - Add KRB5_LIBRARIES and USE_KADM_LIBRARY.
+
 Wed Jun 28 13:13:34 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* sim_server.c: Include <string.h> for memcpy definitions.
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index 5f4d33f4e..bd8a41317 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -1,17 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
-sim_server: sim_server.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sim_server sim_server.o $(KLIB) $(LIBS)
+sim_server: sim_server.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o sim_server sim_server.o $(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 8823e38ee..2eaa6ce89 100644
--- a/src/appl/simple/server/configure.in
+++ b/src/appl/simple/server/configure.in
@@ -1,5 +1,7 @@
 AC_INIT(sim_server.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+USE_KADM_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index ac5507759..49f9453ad 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:49:55 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove explicit library handling.
+	* configure.in - Add USE_KRB4_LIBRARY and KRB5_LIBRARIES.
+
 Sun Jul  2 04:19:48 1995  Tom Yu  <tlyu@lothlorien.MIT.EDU>
 
 	* commands.c: rename setmode() and clearmode() to tel_setmode()
diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 59968ec73..f58ceba51 100644
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -25,10 +25,6 @@ OTHERDEFS=-DLINEMODE -DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 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@ @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 \
 	sys_bsd.c telnet.c terminal.c \
@@ -42,8 +38,8 @@ OBJS=	authenc.o commands.o main.o network.o ring.o sys_bsd.o \
 
 all:: telnet
 
-telnet:	$(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a
-	$(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+telnet:	$(OBJS) $(DEPLIBS) ../libtelnet/libtelnet.a
+	$(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(LIBS)
 
 clean::
 	$(RM) telnet
diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index e3ba0cc52..067a5d092 100644
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -32,5 +32,7 @@ else
 	AC_MSG_RESULT(Kerberos 4 authentication enabled)
 	AC_DEFINE(KRB4)
 fi
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 9203e16fe..11508143f 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+
+Fri Jul 7 15:51:03 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove explicit library handling.
+	* configure.in - Add USE_{KRB4,KADM}_LIBRARY and KRB5_LIBRARIES.
+
 Tue Jun 20 14:25:01 1995  Tom Yu  (tlyu@dragons-lair)
 
 	* defs.h: NO_STRING_H -> HAVE_STRING_H
diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index 0bc4f9b2c..7fe0c160f 100644
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -25,10 +25,6 @@ OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 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@ @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 \
@@ -51,8 +47,8 @@ OBJS=	telnetd.o \
 
 all:: telnetd
 
-telnetd: $(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a
-	$(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS)
+telnetd: $(OBJS) $(DEPLIBS) ../libtelnet/libtelnet.a
+	$(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(LIBS)
 
 clean::
 	$(RM) telnetd
diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index 83a111927..26eba78c5 100644
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -40,5 +40,8 @@ AC_MSG_RESULT($krb5_cv_sys_setpgrp_two)
 if test $krb5_cv_sys_setpgrp_two = yes; then
   AC_DEFINE(SETPGRP_TWOARG)
 fi
+USE_KADM_LIBRARY
+USE_KRB4_LIBRARY
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index 020fef29f..7d6597ea2 100644
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,4 +1,9 @@
 
+Fri Jul 7 15:51:45 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* Makefile.in - Remove explicit library handling and LDFLAGS.
+	* configure.in - Add KRB5_LIBRARIES.
+
+
 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.
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index b7ef96568..757522ed9 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,15 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
-LDFLAGS = -g
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
 
 all::
 
-KLIB = -lkrb5 -lcrypto $(COMERRLIB) 
-DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) 
-
-uuclient: client.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o uuclient client.o $(KLIB) $(LIBS)
+uuclient: client.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o uuclient client.o $(LIBS)
 
 client.o:	$(srcdir)/client.c
 
@@ -19,8 +13,8 @@ all:: uuclient
 clean::
 	$(RM) client.o uuclient
 
-uuserver: server.o $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o uuserver server.o $(KLIB) $(LIBS)
+uuserver: server.o $(DEPLIBS)
+	$(LD) $(LDFLAGS) $(LDARGS) -o uuserver server.o $(LIBS)
 
 server.o:	$(srcdir)/server.c
 
diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in
index fe538ffe8..bdb4228ec 100644
--- a/src/appl/user_user/configure.in
+++ b/src/appl/user_user/configure.in
@@ -1,5 +1,6 @@
 AC_INIT(client.c)
 CONFIG_RULES
 AC_PROG_INSTALL
+KRB5_LIBRARIES
 V5_USE_SHARED_LIB
 V5_AC_OUTPUT_MAKEFILE