Merge of libhack_branch

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

27 files changed, 132 insertions, 101 deletions

diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index db4103987..2847e9fee 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 20:56:47 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Tue Dec 17 17:08:04 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* kadmin.c (kadmin_startup): Do not compare an int to NULL.
diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in
index e7d6ac1b9..73a13f095 100644
--- a/src/kadmin/cli/Makefile.in
+++ b/src/kadmin/cli/Makefile.in
@@ -1,15 +1,17 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 PROG = kadmin
 OBJS = kadmin.o kadmin_ct.o ss_wrapper.o getdate.o keytab.o
 
 all:: $(PROG).local $(PROG)
 
-$(PROG).local: $(OBJS) $(SRVDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o $(PROG).local $(OBJS) $(SRVLIBS)
+$(PROG).local: $(OBJS) $(SS_DEPLIB) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $(PROG).local $(OBJS) $(SS_LIB) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
 
-$(PROG): $(OBJS) $(CLNTDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(CLNTLIBS)
+$(PROG): $(OBJS) $(SS_DEPLIB) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $(PROG) $(OBJS) $(SS_LIB) $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS)
 
 kadmin_ct.o: kadmin_ct.c
 
diff --git a/src/kadmin/cli/configure.in b/src/kadmin/cli/configure.in
index c76b7690e..d843fc37e 100644
--- a/src/kadmin/cli/configure.in
+++ b/src/kadmin/cli/configure.in
@@ -5,13 +5,5 @@ AC_PROG_YACC
 AC_HAVE_HEADERS(unistd.h sys/timeb.h alloca.h)
 AC_HAVE_FUNCS(ftime timezone)
 AC_REPLACE_FUNCS([memmove strftime])
-USE_KADMCLNT_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_KADMSRV_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_DYN_LIBRARY
-USE_KDB5_LIBRARY
-USE_SS_LIBRARY
-V5_USE_SHARED_LIB
-KRB5_LIBRARIES
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 9a23a69b3..9a653a391 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 21:17:09 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Tue Dec  3 16:04:24 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* kdb5_util.c: fix multiply defined globals [krb5-admin/260]
diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in
index b3b12c482..893812109 100644
--- a/src/kadmin/dbutil/Makefile.in
+++ b/src/kadmin/dbutil/Makefile.in
@@ -1,4 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) -DKDB4_DISABLE -I. $(LOCALINCLUDE) @KRB4_INCLUDES@ 
+PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 PROG = kdb5_util
 OBJS	= kdb5_util.o dump.o dumpv4.o loadv4.o \
@@ -7,8 +9,8 @@ OBJS	= kdb5_util.o dump.o dumpv4.o loadv4.o \
 
 all:: $(PROG)
 
-$(PROG): $(OBJS) $(DEPLIBS)
-	$(CC) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(LIBS)
+$(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS)
+	$(CC_LINK) -o $(PROG) $(OBJS) $(KADMSRV_LIBS) $(KRB4COMPAT_LIBS)
 
 import_err.c import_err.h: $(srcdir)/import_err.et
 
diff --git a/src/kadmin/dbutil/configure.in b/src/kadmin/dbutil/configure.in
index 539020aeb..f2e6dd2f8 100644
--- a/src/kadmin/dbutil/configure.in
+++ b/src/kadmin/dbutil/configure.in
@@ -3,14 +3,6 @@ CONFIG_RULES
 AC_HAVE_FUNCS(getcwd strstr)
 AC_PROG_INSTALL
 AC_PROG_AWK
-USE_KADMSRV_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_KDB5_LIBRARY
-USE_DYN_LIBRARY
-USE_KRB4_LIBRARY
-USE_GSSAPI_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 AC_CHECK_HEADERS(krb_db.h kdc.h) dnl 
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog
index afc6cfa2d..3540a4c98 100644
--- a/src/kadmin/ktutil/ChangeLog
+++ b/src/kadmin/ktutil/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 21:11:33 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Thu Nov  7 15:42:17 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* ktutil.c (main): Check the error return from
diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in
index 9888d0b61..d0be5705f 100644
--- a/src/kadmin/ktutil/Makefile.in
+++ b/src/kadmin/ktutil/Makefile.in
@@ -1,6 +1,6 @@
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-
-all::
+CFLAGS = $(CCOPTS) $(DEFS) $(KRB4_INCLUDES)
+PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 OBJS= 	ktutil.o \
 	ktutil_ct.o \
@@ -12,8 +12,8 @@ SRCS= 	$(srcdir)/ktutil.c \
 
 all:: ktutil
 
-ktutil: ktutil.o $(OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o ktutil $(OBJS) $(LIBS)
+ktutil: ktutil.o $(OBJS) $(SS_DEPLIB) $(KRB4COMPAT_DEPLIBS)
+	$(CC_LINK) -o ktutil $(OBJS) $(SS_LIB) $(KRB4COMPAT_LIBS)
 
 install::
 	$(INSTALL_PROGRAM) ktutil ${DESTDIR}$(ADMIN_BINDIR)/ktutil
diff --git a/src/kadmin/ktutil/configure.in b/src/kadmin/ktutil/configure.in
index 7e9f3e1a0..90987d44b 100644
--- a/src/kadmin/ktutil/configure.in
+++ b/src/kadmin/ktutil/configure.in
@@ -1,8 +1,5 @@
 AC_INIT(ktutil.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-USE_KRB4_LIBRARY
-USE_SS_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index 2436ec681..b7cfa343e 100644
--- a/src/kadmin/passwd/ChangeLog
+++ b/src/kadmin/passwd/ChangeLog
@@ -1,3 +1,12 @@
+Wed Feb  5 22:59:43 1997  Tom Yu  <tlyu@mit.edu>
+
+	* unit-test/configure.in: Tweak TCL_LIB -> TCL_LIBS.
+
+Tue Feb  4 21:06:23 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Wed Nov 27 13:50:03 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* configure.in: Link against kdb5 explicitly on all systems except
diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in
index fbf0653d2..26c487ad7 100644
--- a/src/kadmin/passwd/Makefile.in
+++ b/src/kadmin/passwd/Makefile.in
@@ -1,4 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I. -DUSE_KADM5_API_VERSION=1
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 PROG = kpasswd
 OBJS = tty_kpasswd.o kpasswd.o kpasswd_strings.o
@@ -9,8 +11,8 @@ kpasswd_strings.c kpasswd_strings.h: $(srcdir)/kpasswd_strings.et
 
 $(OBJS): kpasswd_strings.h
 
-$(PROG): $(OBJS) $(CLNTDEPLIBS)
-	$(CC) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(CLNTLIBS)
+$(PROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $(PROG) $(OBJS) $(KADMCLNT_LIBS) $(KRB5_BASE_LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(CLIENT_BINDIR)/$(PROG)
diff --git a/src/kadmin/passwd/configure.in b/src/kadmin/passwd/configure.in
index 874f3385b..d47ea63e8 100644
--- a/src/kadmin/passwd/configure.in
+++ b/src/kadmin/passwd/configure.in
@@ -4,10 +4,6 @@ AC_CONFIG_SUBDIRS(unit-test)
 DO_SUBDIRS
 AC_PROG_INSTALL
 AC_PROG_AWK
-USE_KADMCLNT_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_DYN_LIBRARY
 
 dnl 
 dnl The following is a kludge to get around a shared library problem
@@ -15,7 +11,10 @@ dnl for NetBSD and Linux.  We have to include -lkdb5 under Linux, and
 dnl we can't include -lkdb5 under NetBSD, due to various breakages in
 dnl each system's shared library implementation
 dnl
-AC_MSG_CHECKING([for build host])
+
+dnl commented out for now --tlyu
+dnl
+ifelse([AC_MSG_CHECKING([for build host])
 AC_CACHE_VAL(krb5_cv_host, [export CC
 AC_CANONICAL_HOST
 krb5_cv_host=$host])
@@ -27,8 +26,7 @@ case $krb5_cv_host in
 *)
   USE_KDB5_LIBRARY
   ;;
-esac
+esac])
 
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/passwd/unit-test/configure.in b/src/kadmin/passwd/unit-test/configure.in
index f29c02490..609206fea 100644
--- a/src/kadmin/passwd/unit-test/configure.in
+++ b/src/kadmin/passwd/unit-test/configure.in
@@ -4,7 +4,7 @@ dnl The following are tests for the presence of programs required for testing
 AC_CHECK_PROG(RUNTEST,runtest,runtest)
 AC_CHECK_PROG(PERL,perl,perl)
 AC_KRB5_TCL	
-if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIB" != ""; then
+if test "$PERL" = perl -a "$RUNTEST" = runtest -a "$TCL_LIBS" != ""; then
  	DO_TEST=ok
 fi
 AC_SUBST(DO_TEST) 
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 23897964a..e36f94d8c 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  4 20:59:31 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Wed Dec  4 15:29:30 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* ovsec_kadmd.c (main): fix duplicated error strings
diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in
index d61737d20..5ce41d0fe 100644
--- a/src/kadmin/server/Makefile.in
+++ b/src/kadmin/server/Makefile.in
@@ -1,12 +1,15 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
+
 PROG = kadmind
 OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o misc.o server_glue_v1.o
 
 all:: $(PROG)
 
-$(PROG): $(OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(LIBS)
+$(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $(PROG) $(OBJS) $(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
diff --git a/src/kadmin/server/configure.in b/src/kadmin/server/configure.in
index 98492f909..17d9f9009 100644
--- a/src/kadmin/server/configure.in
+++ b/src/kadmin/server/configure.in
@@ -7,11 +7,5 @@ dnl CHECK_SIGNALS
 dnl CHECK_SETJMP
 dnl CHECK_WAIT_TYPE
 dnl ET_RULES
-USE_KADMSRV_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_KDB5_LIBRARY
-USE_DYN_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index bfc97a89e..c21053d49 100644
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,12 @@
+Sun Feb  9 01:07:37 1997  Tom Yu  <tlyu@mit.edu>
+
+	* env-setup.shin: Fix to deal with multiple variables in
+	KRB5_RUN_ENV.
+
+Sat Feb  8 22:12:32 1997  Tom Yu  <tlyu@mit.edu>
+
+	* env-setup.shin: Hack to deal with new usage of KRB5_RUN_ENV.
+
 Tue Dec  3 15:28:53 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* init_db: be verbose when $SRVTCL doesn't exist, instead of just
diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index ae5013009..d15c81fd9 100644
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -18,14 +18,23 @@ export STOP
 
 # The shared library run time setup
 TOPLIBD=@RBUILD@/lib
+PROG_LIBPATH=-L@RBUILD@/lib
+# XXX kludge!
+PROG_RPATH=@RBUILD@/lib
 # This converts $(TOPLIBD) to $TOPLIBD
-foo=`echo '@KRB5_RUN_ENV@' | sed -e 's/(//' -e 's/)//'` 
+cat > /tmp/env_setup$$ <<\EOF
+@KRB5_RUN_ENV@
+EOF
+
+foo=`sed -e 's/(//g' -e 's/)//g' /tmp/env_setup$$`
 eval $foo
 
 # This will get put in setup.csh for convenience
 KRB5_RUN_ENV_CSH=`eval echo "$foo" | \
-	sed -e 's/\([^=]*\)=\(.*\)/setenv \1 \2/g'`
+	sed -e 's/\([^=]*\)=\(.*\)/setenv \1 \2/g' \
+	-e 's/export [^ ;]*;//g'`
 export KRB5_RUN_ENV_CSH
+rm /tmp/env_setup$$
 
 TESTDIR=$TOP/testing; export TESTDIR
 STESTDIR=$STOP/testing; export STESTDIR
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index 698414ab2..f011d939a 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  5 22:57:53 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Dec  6 00:04:10 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* test.c: Change test looking for tcl 7.05 and greater to be tcl
diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in
index a650fc37d..cc5835836 100644
--- a/src/kadmin/testing/util/Makefile.in
+++ b/src/kadmin/testing/util/Makefile.in
@@ -1,7 +1,7 @@
-TCLINC=@TCL_INC@
-TCLLIB=@TCL_LIB@ -lm
+CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCL_INCLUDES)
 
-CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCLINC)
+PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
+PROG_RPATH=$(KRB5_LIBDIR)$(TCL_RPATH)
 
 SRCS	=	tcl_ovsec_kadm.c tcl_kadm5.c test.c
 OBJS	=	tcl_ovsec_kadm.o tcl_kadm5.o test.o
@@ -18,14 +18,16 @@ all-::
 
 all-tcl:: $(CLNTPROG) $(SRVPROG)
 
-$(SRVPROG): $(OBJS) $(SRVDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o $(SRVPROG) $(OBJS) $(SRVLIBS) $(TCLLIB)
+$(SRVPROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $(SRVPROG) $(OBJS) \
+		$(KADMSRV_LIBS) $(KRB5_BASE_LIBS) $(TCL_LIBS)
 
-$(CLNTPROG): $(OBJS) $(CLNTDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o $(CLNTPROG) $(OBJS) $(CLNTLIBS) $(TCLLIB)
+$(CLNTPROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $(CLNTPROG) $(OBJS) \
+		$(KADMCLNT_LIBS) $(KRB5_BASE_LIBS) $(TCL_LIBS)
 
 bsddb_dump: bsddb_dump.o
-	$(LD) $(LDFLAGS) $(LDARGS) -o bsddb_dump bsddb_dump.o $(SRVLIBS)
+	$(CC_LINK) -o bsddb_dump bsddb_dump.o $(KADMSRV_LIBS)
 
 clean:: 
 	$(RM) $(CLNTPROG) $(SRVPROG)
diff --git a/src/kadmin/testing/util/configure.in b/src/kadmin/testing/util/configure.in
index 911c0d6b6..6c6d32ffd 100644
--- a/src/kadmin/testing/util/configure.in
+++ b/src/kadmin/testing/util/configure.in
@@ -3,18 +3,10 @@ CONFIG_RULES
 AC_PROG_INSTALL
 dnl Test for tcl
 AC_KRB5_TCL	
-if test "$TCL_LIB" != "" ;  then
+if test "$TCL_LIBS" != "" ;  then
 	DO_ALL=tcl
 fi
 AC_SUBST(DO_ALL)
 dnl
-USE_KADMCLNT_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_KADMSRV_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_DYN_LIBRARY
-USE_KDB5_LIBRARY
-USE_SS_LIBRARY
-V5_USE_SHARED_LIB
-KRB5_LIBRARIES
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index 2966ad100..c05b4a2f3 100644
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,12 @@
+Thu Feb  6 14:49:45 1997  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
+
+	* Makefile.in (LOCALINCLUDE): Repair lack of -I. and -I$(srcdir)
+
+Tue Feb  4 21:23:16 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Nov 22 15:49:27 1996  unknown  <bjaspan@mit.edu>
 
 	* kadm_ser_wrap.c (endif ): use sizeof instead of h_length to
diff --git a/src/kadmin/v4server/Makefile.in b/src/kadmin/v4server/Makefile.in
index b1c5c90a7..ae99b3573 100644
--- a/src/kadmin/v4server/Makefile.in
+++ b/src/kadmin/v4server/Makefile.in
@@ -1,7 +1,9 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) \
 	-DOVSEC_KADM -DUSE_KADM5_API_VERSION=1 -DNEED_SOCKETS
+PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
+PROG_RPATH=$(KRB5_LIBDIR)
 
-LOCALINCLUDE = -I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV -I.
+LOCALINCLUDE = $(KRB4_INCLUDES) -I. -I$(srcdir)
 
 PROG = kadmind4
 OBJS = kadm_server.o admin_server.o kadm_ser_wrap.o \
@@ -9,12 +11,12 @@ OBJS = kadm_server.o admin_server.o kadm_ser_wrap.o \
 
 all:: $(PROG)
 
-kadm_err.c kadm_err.h: $(srcdir)/kadm_err.et
+kadm_err.c kadm_err.h: kadm_err.et
 
 $(OBJS): kadm_err.h
 
-$(PROG): $(OBJS) $(DEPLIBS)
-	$(CC) $(LDFLAGS) $(LDARGS) -o $(PROG) $(OBJS) $(LIBS)
+$(PROG): $(OBJS) $(KADMCLNT_DEPLIBS) $(DB_DEPLIB) $(KRB4COMPAT_DEPLIBS)
+	$(CC_LINK) -o $(PROG) $(OBJS) $(KADMCLNT_LIBS) $(DB_LIB) $(KRB4COMPAT_LIBS)
 
 install::
 	$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
diff --git a/src/kadmin/v4server/configure.in b/src/kadmin/v4server/configure.in
index 96f3653c2..9af805d9b 100644
--- a/src/kadmin/v4server/configure.in
+++ b/src/kadmin/v4server/configure.in
@@ -6,12 +6,5 @@ AC_CHECK_HEADERS(sys/time.h unistd.h stdlib.h)
 CHECK_SIGNALS
 CHECK_WAIT_TYPE
 AC_PROG_AWK
-USE_KADMCLNT_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_DYN_LIBRARY
-USE_KDB5_LIBRARY
-USE_KRB4_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index 5532f981e..8cdc355be 100644
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -3,6 +3,11 @@ Thu Feb  6 00:28:54 1997  Richard Basch  <basch@lehman.com>
 	* adm_conn.c adm_rw.c:
 		Replace the INTERFACE keyword with KRB5_CALLCONV
 
+Tue Feb  4 21:28:57 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedcure.
+
 Thu Oct 31 11:20:22 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* main.c (main): Add -T keyfile and -D debug_level
diff --git a/src/kadmin/v5passwdd/Makefile.in b/src/kadmin/v5passwdd/Makefile.in
index 54b9aa084..9d9a9756b 100644
--- a/src/kadmin/v5passwdd/Makefile.in
+++ b/src/kadmin/v5passwdd/Makefile.in
@@ -1,5 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
-
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 COMMON_SRCS = adm_rw.c
 COMMON_OBJS = adm_rw.o
@@ -16,14 +17,14 @@ CLI = v5passwd
 
 all:: $(SERV) $(CLI)
 
-$(SERV): $(SERV_OBJS) $(COMMON_OBJS) $(SRVDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o $(SERV) $(SERV_OBJS) \
-		$(COMMON_OBJS) $(SRVLIBS)
+$(SERV): $(SERV_OBJS) $(COMMON_OBJS) $(KADMSRV_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $(SERV) $(SERV_OBJS) $(COMMON_OBJS) \
+		$(KADMSRV_LIBS) $(KRB5_BASE_LIBS)
 
 
-$(CLI): $(CLI_OBJS) $(COMMON_OBJS) $(CLNTDEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o $(CLI) $(CLI_OBJS) \
-		$(COMMON_OBJS) $(CLNTLIBS)
+$(CLI): $(CLI_OBJS) $(COMMON_OBJS) $(KADMCLNT_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o $(CLI) $(CLI_OBJS) $(COMMON_OBJS) \
+		$(KADMCLNT_LIBS) $(KRB5_BASE_LIBS)
 
 install::
 	for f in v5passwd; do \
diff --git a/src/kadmin/v5passwdd/configure.in b/src/kadmin/v5passwdd/configure.in
index ce43d2f2e..28fc95dac 100644
--- a/src/kadmin/v5passwdd/configure.in
+++ b/src/kadmin/v5passwdd/configure.in
@@ -1,17 +1,10 @@
 AC_INIT(proto_serv.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-AC_FUNC_CHECK(waitpid,AC_DEFINE(HAVE_WAITPID))
-AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAVE_VSPRINTF))
+AC_CHECK_FUNCS(waitpid vsprintf)
 AC_CHECK_HEADERS(sys/select.h)
 CHECK_SIGNALS
 CHECK_SETJMP
 CHECK_WAIT_TYPE
-USE_KADMSRV_LIBRARY
-USE_GSSRPC_LIBRARY
-USE_GSSAPI_LIBRARY
-USE_KDB5_LIBRARY
-USE_DYN_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE