Merge of libhack_branch

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

4 files changed, 20 insertions, 11 deletions

diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog
index 2436ec681a..b7cfa343ed 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 fbf0653d28..26c487ad79 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 874f3385b5..d47ea63e8a 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 f29c024907..609206fea9 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)