Merge of libhack_branch

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

34 files changed, 136 insertions, 222 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 53cd10b..b06fc6a 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -3,6 +3,11 @@ Sat Dec 28 21:06:43 1996  Sam Hartman  <hartmans@luminous.MIT.EDU>
 	* login.c: Force environment variables like HOME to be set even if
  	-p given.
 
+Wed Feb  5 20:56:03 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Tue Dec 24 16:08:41 1996  Tom Yu  <tlyu@mit.edu>
 
 	* configure.in: Fix up "test $ac_cv_c_cross" to deal with
diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in
index c7a4963..368ceb8 100644
--- a/src/appl/bsd/Makefile.in
+++ b/src/appl/bsd/Makefile.in
@@ -1,5 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DEFINES)
-LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV
+LOCALINCLUDE=@KRB4_INCLUDES@
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
+
 SETENVSRC=@SETENVSRC@
 SETENVOBJ=@SETENVOBJ@
 
@@ -8,9 +11,6 @@ LIBOBJS=@LIBOBJS@
 V4RCP=@V4RCP@
 V4RCPO=@V4RCPO@
 
-LOCAL_LIBRARIES=-lpty
-DEPLOCAL_LIBRARIES=$(TOPLIBD)/../util/pty/libpty.a
-
 SRCS= krcp.c krlogin.c krsh.c kcmd.c forward.c  $(SETENVSRC) \
 	login.c krshd.c krlogind.c v4rcp.c
 OBJS= krcp.o krlogin.o krsh.o kcmd.o forward.o  $(SETENVOBJ) \
@@ -32,17 +32,17 @@ all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP)
 clean:: 
 	$(RM) rsh rcp rlogin kshd klogind login.krb5 v4rcp
 
-rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
+rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(UTIL_DEPLIB) $(KRB4COMPAT_DEPLIBS)
+	$(CC_LINK) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(UTIL_LIB) $(KRB4COMPAT_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)
+rcp: krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(UTIL_DEPLIB) $(KRB4COMATP_DEPLIBS)
+	$(CC_LINK) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(UTIL_LIB) $(KRB4COMPAT_LIBS)
 
-v4rcp: v4rcp.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o v4rcp v4rcp.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
+v4rcp: v4rcp.o $(SETENVOBJ) $(LIBOBJS) $(UTIL_DEPLIB) $(KRB4COMPAT_DEPLIBS)
+	$(CC_LINK) -o v4rcp v4rcp.o $(SETENVOBJ) $(LIBOBJS) $(UTIL_LIB) $(KRB4COMPAT_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)
+rlogin: krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(PTY_DEPLIB) $(UTIL_DEPLIB) $(KRB4COMPAT_DEPLIBS)
+	$(CC_LINK) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS)
 
 install::
 	for f in rsh rcp rlogin; do \
@@ -59,11 +59,11 @@ install::
 		${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
 	fi
 
-kshd: krshd.o kcmd.o  forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kshd krshd.o kcmd.o  forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
+kshd: krshd.o kcmd.o  forward.o $(SETENVOBJ) $(LIBOBJS) $(PTY_DEPLIB) $(UTIL_DEPLIB) $(KRB4COMPAT_DEPLIBS)
+	$(CC_LINK) -o kshd krshd.o kcmd.o  forward.o $(SETENVOBJ) $(LIBOBJS) $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS)
 
-klogind: krlogind.o  kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o klogind krlogind.o  kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(LIBS)
+klogind: krlogind.o  kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(PTY_DEPLIB) $(UTIL_DEPLIB) $(KRB4COMPAT_DEPLIBS)
+	$(CC_LINK) -o klogind krlogind.o  kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS)
 
 install::
 	for f in kshd klogind; do \
@@ -74,15 +74,11 @@ install::
 	 ) || exit 1 ; \
 	done
 
-#
-# We load the libraries twice here since des425 has a dependency on 
-# krb5_read_passwrd in krb5.a.  Sigh, circular references.
-#
 # No program name transformation is done with login.krb5 since it is directly
 # referenced by klogind.
 #
-login.krb5: login.o  $(SETENVOBJ) $(LIBOBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o login.krb5 login.o $(SETENVOBJ) $(LIBOBJS) $(LOGINLIBS) $(LIBS)
+login.krb5: login.o  $(SETENVOBJ) $(LIBOBJS) $(PTY_DEPLIB) $(UTIL_DEPLIB) $(KRB4COMPAT_DEPLIBS)
+	$(CC_LINK) -o login.krb5 login.o $(SETENVOBJ) $(LIBOBJS) $(LOGINLIBS) $(PTY_LIB) $(UTIL_LIB) $(KRB4COMPAT_LIBS)
 
 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 ab2789a..d654860 100644
--- a/src/appl/bsd/configure.in
+++ b/src/appl/bsd/configure.in
@@ -12,7 +12,6 @@ fi
 AC_PROG_INSTALL
 dnl dbm libs for use of an_to_ln
 AC_CHECK_LIB(util,main)
-USE_ANAME
 AC_CHECK_LIB(crypt,crypt)
 dnl
 dnl AIX has them all; SCO might too
@@ -218,10 +217,6 @@ KRB5_CHECK_PROTOS
 dnl
 ADD_DEF(-DKERBEROS)
 AC_CONST
-USE_KRB4_LIBRARY
-USE_KRB5UTIL_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
 if test "$krb5_cv_build_krb4_libs" = yes; then
 	AC_DEFINE(HAVE_KRB_GET_ERR_TEXT)
 	AC_DEFINE(HAVE_KRB_SAVE_CREDENTIALS)
@@ -233,4 +228,6 @@ else
 fi
 
 AC_CHECK_HEADERS(krb4-proto.h)
+
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index 110e722..7cc9386 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  5 20:25:57 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Nov 22 15:48:02 1996  unknown  <bjaspan@mit.edu>
 
 	* gss-client.c (connect_to_server): use sizeof instead of h_length
diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in
index 9c4167f..948b83e 100644
--- a/src/appl/gss-sample/Makefile.in
+++ b/src/appl/gss-sample/Makefile.in
@@ -1,4 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_AUTOCONF_H -DGSSAPI_V2
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS= gss-client.c gss-misc.c gss-server.c
 
@@ -6,17 +8,11 @@ OBJS= gss-client.o gss-misc.o gss-server.o
 
 all:: gss-server gss-client
 
-gss-server: gss-server.o gss-misc.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o gss-server gss-server.o gss-misc.o $(LIBS)
+gss-server: gss-server.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o gss-server gss-server.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_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
-
-gss-misc.o:	$(srcdir)/gss-misc.c
-
-gss-server.o:	$(srcdir)/gss-server.c
+gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) gss-server gss-client
diff --git a/src/appl/gss-sample/configure.in b/src/appl/gss-sample/configure.in
index 7d43775..635fa9a 100644
--- a/src/appl/gss-sample/configure.in
+++ b/src/appl/gss-sample/configure.in
@@ -5,7 +5,5 @@ AC_CHECK_HEADERS(unistd.h stdlib.h)
 AC_CHECK_HEADER(string.h,AC_DEFINE(USE_STRING_H))
 AC_CONST
 AC_PROG_INSTALL
-USE_GSSAPI_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 9d39c10..2dced63 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  5 20:29:31 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Nov 22 15:48:19 1996  unknown  <bjaspan@mit.edu>
 
 	* ftp.c (hookup): use sizeof instead of h_length to determine
diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index 145ddc2..27a39b2 100644
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -2,8 +2,8 @@
 # appl/gssftp/ftp/Makefile.in
 #
 CFLAGS = -DGSSAPI -DFTP_BUFSIZ=10240 $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-
-COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS	= cmds.c cmdtab.c domacro.c ftp.c getpass.c glob.c main.c pclose.c \
 	  radix.c ruserpass.c secure.c 
@@ -12,17 +12,13 @@ SRCS	= cmds.c cmdtab.c domacro.c ftp.c getpass.c glob.c main.c pclose.c \
 OBJS	= cmds.o cmdtab.o domacro.o ftp.o getpass.o glob.o main.o pclose.o \
 	  radix.o ruserpass.o secure.o
 
-KLIB = -lgssapi_krb5 -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \
-		$(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
 LOCALINCLUDE = -I$(srcdir)/..
 DEFINES = -DGSSAPI -DNOCONFIDENTIAL
 
 all::	ftp
 
-ftp:	$(OBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o ftp $(OBJS) $(KLIB) $(LIBS)
+ftp:	$(OBJS) $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o ftp $(OBJS) $(GSS_LIBS) $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) ftp
diff --git a/src/appl/gssftp/ftp/configure.in b/src/appl/gssftp/ftp/configure.in
index 40b0785..cac62b4 100644
--- a/src/appl/gssftp/ftp/configure.in
+++ b/src/appl/gssftp/ftp/configure.in
@@ -16,6 +16,5 @@ AC_HEADER_STDARG
 AC_CHECK_HEADERS(sys/select.h)
 AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK(cfsetispeed,AC_DEFINE(POSIX_TERMIOS)))
 AC_CHECK_HEADERS(stdlib.h)
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 2a2e348..673bcf1 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  5 20:34:38 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Tue Nov 12 00:04:00 1996  Tom Yu  <tlyu@mit.edu>
 
 	* ftpd.c (ftpd_userok): Don't undconditionally return -1.
diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in
index c6dec99..2905352 100644
--- a/src/appl/gssftp/ftpd/Makefile.in
+++ b/src/appl/gssftp/ftpd/Makefile.in
@@ -2,6 +2,8 @@
 # appl/gssftp/ftpd/Makefile.in
 #
 CFLAGS = -DGSSAPI -DFTP_BUFSIZ=10240 $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 SETENVSRC=@SETENVSRC@
 SETENVOBJ=@SETENVOBJ@
@@ -17,17 +19,13 @@ SRCS	= ftpd.c ftpcmd.y logwtmp.c popen.c vers.c \
 OBJS	= ftpd.o ftpcmd.o glob.o popen.o logwtmp.o vers.o radix.o \
 	  secure.o $(LIBOBJS) $(SETENVOBJ)
 
-KLIB = -lgssapi_krb5 -lkrb5 -lcrypto $(COMERRLIB)
-DEPKLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \
-		$(TOPLIBD)/libcrypto.a $(COMERRLIB)
-
 LOCALINCLUDE = -I$(srcdir)/..
 DEFINES = -DGSSAPI -DNOCONFIDENTIAL
 
 all::	ftpd
 
-ftpd:	$(OBJS) $(DEPKLIB)
-	$(LD) $(LDFLAGS) $(LDARGS) -o $@ $(OBJS) $(KLIB) $(LIBS)
+ftpd:	$(OBJS) $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $@ $(OBJS) $(GSS_LIBS) $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) ftpd ftpcmd.c
diff --git a/src/appl/gssftp/ftpd/configure.in b/src/appl/gssftp/ftpd/configure.in
index e247201..055ad84 100644
--- a/src/appl/gssftp/ftpd/configure.in
+++ b/src/appl/gssftp/ftpd/configure.in
@@ -45,7 +45,5 @@ AC_DEFINE(HAVE_SHADOW)
 fi
 dnl
 dnl
-USE_ANAME
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/popper/Imakefile b/src/appl/popper/Imakefile
deleted file mode 100644
index d46dc30..0000000
--- a/src/appl/popper/Imakefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#	$Source$
-#	$Author$
-#	$Id$
-#
-#  Copyright 1991 by the Massachusetts Institute of Technology.
-#  All Rights Reserved.
-# 
-# Export of this software from the United States of America may
-#   require a specific license from the United States Government.
-#   It is the responsibility of any person or organization contemplating
-#   export to obtain such a license before exporting.
-# 
-# WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
-# distribute this software and its documentation for any purpose and
-# without fee is hereby granted, provided that the above copyright
-# notice appear in all copies and that both that copyright notice and
-# this permission notice appear in supporting documentation, and that
-# the name of M.I.T. not be used in advertising or publicity pertaining
-# to distribution of the software without specific, written prior
-# permission.  M.I.T. makes no representations about the suitability of
-# this software for any purpose.  It is provided "as is" without express
-# or implied warranty.
-# 
-# 
-
-#               Options are:
-#               BIND43          -	If you are using BSD 4.3 domain
-#					name service.
-#		DEBUG		-	Include the debugging code.  Note:  You
-#					still have to use the -d or -t flag to
-#					enable debugging.
-#               HAVE_VSPRINTF   -	If the vsprintf functions are
-#					available 
-#					on your system.
-#               SYSLOG42        -	For BSD 4.2 syslog (default is BSD 4.3 
-#					syslog).
-#               STRNCASECMP     -	If you do not have strncasecmp()
-#		KERBEROS  	-       If you want authentication vis Kerberos
-#									(tom)
-#		KERBEROS_PASSWD_HACK -  Use popper as passwd server
-#		NOSTATUS	-	Don't create a Mail(1)-like
-#					Status: header
-
-#if defined(OS_BSD_RENO) || defined(OS_Ultrix) || defined(OS_SunOS4) || defined(OS_BSD)
-BINDDEF=-DBIND43
-#else
-/* assume it's not there; not really critical since we are using Kerberos to
-   beef up the normal IP-address checking stuff */
-BINDDEF=
-#endif
-
-#if 0
-
-/* Zephyr stuff not needed yet, since spop isn't done yet. */
-DEFINES = -DHAVE_VSPRINTF -DKERBEROS -DKRB5 -DNOSTATUS -DDEBUG $(BINDDEF) $(ZEPHDEFS)
-LOCAL_LIBRARIES = $(ZEPHLIBS) $(KLIB)
-DEP_LIBS= $(ZEPHDEPLIB) $(DEPKLIB)
-
-#else
-
-DEFINES = -DHAVE_VSPRINTF -DKERBEROS -DKRB5 -DNOSTATUS -DDEBUG $(BINDDEF)
-LOCAL_LIBRARIES = $(KLIB)
-DEP_LIBS= $(DEPKLIB)
-
-#endif
-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 \
-			pop_msg.o pop_parse.o pop_pass.o pop_quit.o \
-			pop_rset.o pop_send.o pop_stat.o pop_updt.o \
-			pop_user.o pop_xtnd.o pop_xmit.o popper.o
-SRCS		=	pop_dele.c pop_dropcopy.c pop_dropinfo.c \
-			pop_get_command.c pop_get_subcommand.c pop_init.c \
-			pop_last.c pop_list.c pop_log.c pop_lower.c \
-			pop_msg.c pop_parse.c pop_pass.c pop_quit.c \
-			pop_rset.c pop_send.c pop_stat.c pop_updt.c \
-			pop_user.c pop_xtnd.c pop_xmit.c popper.c $(SPOP_SRCS)
-#if 0
-SPOP_OBJS	=	pop_enter.o
-SPOP_SRCS	=	pop_enter.c
-#endif
-
-all:: popper
-
-NormalProgramTarget(popper,$(OBJS),$(DEP_LIBS),$(LOCAL_LIBRARIES),)
-Krb5InstallServerProgram(popper)
-
-#if 0
-NormalProgramTarget(spop,$(SPOP_OBJS),$(DEP_LIBS),$(LOCAL_LIBRARIES),)
-Krb5InstallServerProgram(spop)
-#endif
-
-DependTarget()
diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog
index a87734f..b814589 100644
--- a/src/appl/sample/sclient/ChangeLog
+++ b/src/appl/sample/sclient/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 20:44:24 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Thu Nov  7 15:25:03 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* sclient.c (argv): Check the error return from
diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in
index 40587b2..8763029 100644
--- a/src/appl/sample/sclient/Makefile.in
+++ b/src/appl/sample/sclient/Makefile.in
@@ -1,14 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-
-all::
-
-sclient: sclient.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(LIBS)
-
-sclient.o:	$(srcdir)/sclient.c
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: sclient
 
+sclient: sclient.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o sclient sclient.o $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) sclient.o sclient
diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in
index 3683371..0a1fcf4 100644
--- a/src/appl/sample/sclient/configure.in
+++ b/src/appl/sample/sclient/configure.in
@@ -2,6 +2,5 @@ AC_INIT(sclient.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 AC_CHECK_HEADERS(stdlib.h)
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog
index be41b71..591aef5 100644
--- a/src/appl/sample/sserver/ChangeLog
+++ b/src/appl/sample/sserver/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 20:47:55 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Thu Dec  5 19:44:05 1996  Tom Yu  <tlyu@mit.edu>
 
 	* sserver.M: remove ref's to "/krb5" [PR 279]
diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in
index 84e6a0e..5be42c2 100644
--- a/src/appl/sample/sserver/Makefile.in
+++ b/src/appl/sample/sserver/Makefile.in
@@ -1,14 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-
-all::
-
-sserver: sserver.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(LIBS)
-
-sserver.o:	$(srcdir)/sserver.c
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: sserver
 
+sserver: sserver.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o sserver sserver.o $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) sserver.o sserver
diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in
index 8496e5e..af0f45a 100644
--- a/src/appl/sample/sserver/configure.in
+++ b/src/appl/sample/sserver/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(sserver.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog
index db1136c..9deae0c 100644
--- a/src/appl/simple/client/ChangeLog
+++ b/src/appl/simple/client/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 20:38:44 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Nov 22 15:48:30 1996  unknown  <bjaspan@mit.edu>
 
 	* sim_client.c (main): use sizeof instead of h_length to determine
diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in
index 0424a3e..f9f5303 100644
--- a/src/appl/simple/client/Makefile.in
+++ b/src/appl/simple/client/Makefile.in
@@ -1,19 +1,16 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
-all::
+all:: sim_client
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
-sim_client: sim_client.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sim_client sim_client.o $(LIBS)
-
-sim_client.o:	$(srcdir)/sim_client.c
-
-all:: sim_client
+sim_client: sim_client.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o sim_client sim_client.o $(KRB5_BASE_LIBS)
 
 install::
 	$(INSTALL_PROGRAM) sim_client $(DESTDIR)$(CLIENT_BINDIR)/sim_client
 
 clean::
 	$(RM) sim_client.o sim_client
-
diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in
index a942368..3d81282 100644
--- a/src/appl/simple/client/configure.in
+++ b/src/appl/simple/client/configure.in
@@ -5,6 +5,5 @@ AC_CHECK_HEADERS(stdlib.h)
 if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then
 	AC_DEFINE(BROKEN_STREAMS_SOCKETS)
 fi
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog
index 6e30ce4..dd7e1e1 100644
--- a/src/appl/simple/server/ChangeLog
+++ b/src/appl/simple/server/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 20:41:49 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Nov 22 15:48:42 1996  unknown  <bjaspan@mit.edu>
 
 	* sim_server.c (argv): use sizeof instead of h_length to determine
diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in
index bd8a413..332c266 100644
--- a/src/appl/simple/server/Makefile.in
+++ b/src/appl/simple/server/Makefile.in
@@ -2,19 +2,16 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 LOCALINCLUDE= -I.. -I$(srcdir)/..
 
-all::
-
-sim_server: sim_server.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o sim_server sim_server.o $(LIBS)
-
-sim_server.o:	$(srcdir)/sim_server.c
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: sim_server
 
+sim_server: sim_server.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o sim_server sim_server.o $(KRB5_BASE_LIBS)
+
 install::
 	$(INSTALL_PROGRAM) sim_server $(DESTDIR)$(SERVER_BINDIR)/sim_server
 
-
 clean::
 	$(RM) sim_server.o sim_server
-
diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in
index f754694..61590e6 100644
--- a/src/appl/simple/server/configure.in
+++ b/src/appl/simple/server/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(sim_server.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog
index f58e895..c6ee523 100644
--- a/src/appl/telnet/telnet/ChangeLog
+++ b/src/appl/telnet/telnet/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  5 22:03:35 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Tue Nov 26 20:41:31 1996  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
 
 	* configure.in: Check for apra/inet.h
diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 8429c22..ca7e743 100644
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -26,6 +26,9 @@ LOCALINCLUDES=-I.. -I$(srcdir)/..
 CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
+
 SRCS=	authenc.c commands.c main.c network.c ring.c \
 	sys_bsd.c telnet.c terminal.c \
 	utilities.c $(GETOPT_SRC)
@@ -38,8 +41,8 @@ OBJS=	authenc.o commands.o main.o network.o ring.o sys_bsd.o \
 
 all:: telnet
 
-telnet:	$(OBJS) $(DEPLIBS) ../libtelnet/libtelnet.a
-	$(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(LIBS)
+telnet:	$(OBJS) $(KRB4COMPAT_DEPLIBS) ../libtelnet/libtelnet.a
+	$(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet.a $(KRB4COMPAT_LIBS)
 
 clean::
 	$(RM) telnet
diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in
index 3d08e2f..86f8893 100644
--- a/src/appl/telnet/telnet/configure.in
+++ b/src/appl/telnet/telnet/configure.in
@@ -46,8 +46,5 @@ if test $withval = no; then
 	DEPKRB4_CRYPTO_LIB='$(TOPLIBD)/libdes425.a'
 fi
 dnl
-USE_KRB4_LIBRARY
-USE_ANAME
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index f537d11..64155d8 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  5 22:08:58 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Thu Nov  7 15:32:06 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* telnetd.c (main): Check the error return from
diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index 26887b9..d3dcfca 100644
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -20,14 +20,15 @@
 #	@(#)Makefile.generic	5.5 (Berkeley) 3/1/91
 #
 
-LOCAL_LIBRARIES=-lpty
-DEPLOCAL_LIBRARIES=$(TOPLIBD)/../util/pty/libpty.a
 AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
 OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 LOCALINCLUDES=-I.. -I$(srcdir)/..
 CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 
+PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
+PROG_RPATH=$(KRB5_LIBDIR)
+
 SRCS=	$(srcdir)/telnetd.c \
 	$(srcdir)/termio-tn.c \
 	$(srcdir)/termios-tn.c \
@@ -53,8 +54,8 @@ OBJS=	telnetd.o \
 
 all:: telnetd
 
-telnetd: $(OBJS) $(DEPLIBS) ../libtelnet/libtelnet.a
-	$(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(LIBS)
+telnetd: $(OBJS) $(PTY_DEPLIB) $(KRB4COMPAT_DEPLIBS) ../libtelnet/libtelnet.a
+	$(CC_LINK) -o $@ $(OBJS) ../libtelnet/libtelnet.a $(PTY_LIB) $(KRB4COMPAT_LIBS)
 
 clean::
 	$(RM) telnetd
diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index 5522101..ac08e55 100644
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -71,11 +71,9 @@ dnl Fix post beta-6
 withval=no
 AC_ARG_WITH([krb4],[],,withval=yes)
 if test $withval = no; then
-	KRB4_CRYPTO_LIB='-ldes425'
-	DEPKRB4_CRYPTO_LIB='$(TOPLIBD)/libdes425.a'
+	DES425_LIB=-ldes425
+	DES425_DEPLIB='$(TOPLIBD)/libdes425.a'
 fi
 dnl
-USE_KRB4_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index e005075..e6706b4 100644
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 20:35:45 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Nov 22 15:49:09 1996  unknown  <bjaspan@mit.edu>
 
 	* client.c (argv): use sizeof instead of h_length to determine
diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in
index 757522e..fe2906a 100644
--- a/src/appl/user_user/Makefile.in
+++ b/src/appl/user_user/Makefile.in
@@ -1,24 +1,17 @@
 CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
-all::
-
-uuclient: client.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o uuclient client.o $(LIBS)
-
-client.o:	$(srcdir)/client.c
-
-all:: uuclient
+all:: uuclient uuserver
 
+uuclient: client.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o uuclient client.o $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) client.o uuclient
 
-uuserver: server.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o uuserver server.o $(LIBS)
-
-server.o:	$(srcdir)/server.c
-
-all:: uuserver
+uuserver: server.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o uuserver server.o $(KRB5_BASE_LIBS)
 
 install::
 	$(INSTALL_PROGRAM) uuclient $(DESTDIR)$(CLIENT_BINDIR)/uuclient
@@ -26,4 +19,3 @@ install::
 
 clean::
 	$(RM) server.o uuserver
-
diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in
index bdb4228..32d7800 100644
--- a/src/appl/user_user/configure.in
+++ b/src/appl/user_user/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(client.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE