Merge of libhack_branch

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

21 files changed, 73 insertions, 49 deletions

diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog
index 3e3898e89..ff0f955ea 100644
--- a/src/tests/asn.1/ChangeLog
+++ b/src/tests/asn.1/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  9 01:31:00 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Thu Nov 14 14:13:41 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* krb5_encode_test.c (PRS): Add the -p option to krb5_encode_test
diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in
index 7511349c2..c9d00528a 100644
--- a/src/tests/asn.1/Makefile.in
+++ b/src/tests/asn.1/Makefile.in
@@ -1,7 +1,8 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES)
-RUN_SETUP = @KRB5_RUN_ENV@
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
-COMERRLIB=$(TOPLIBD)/libcom_err.a
+RUN_SETUP = @KRB5_RUN_ENV@
 
 all:: krb5_encode_test krb5_decode_test trval
 
@@ -9,13 +10,13 @@ LOCALINCLUDES = -I$(srcdir)/../../lib/krb5/asn.1
 
 ENCOBJS = krb5_encode_test.o ktest.o ktest_equal.o utility.o trval.o
 
-krb5_encode_test: $(ENCOBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o krb5_encode_test $(ENCOBJS) $(LIBS)
+krb5_encode_test: $(ENCOBJS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o krb5_encode_test $(ENCOBJS) $(KRB5_BASE_LIBS)
 
 DECOBJS = krb5_decode_test.o ktest.o ktest_equal.o utility.o
 
-krb5_decode_test: $(DECOBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o krb5_decode_test $(DECOBJS) $(LIBS)
+krb5_decode_test: $(DECOBJS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o krb5_decode_test $(DECOBJS) $(KRB5_BASE_LIBS)
 
 trval: $(srcdir)/trval.c
 	$(CC) -o trval $(CFLAGS) -DSTANDALONE $(srcdir)/trval.c
diff --git a/src/tests/asn.1/configure.in b/src/tests/asn.1/configure.in
index 532482137..61711098f 100644
--- a/src/tests/asn.1/configure.in
+++ b/src/tests/asn.1/configure.in
@@ -2,6 +2,5 @@ AC_INIT(krb5_encode_test.c)
 CONFIG_RULES
 AC_PROG_INSTALL
 KRB5_RUN_FLAGS
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 5a3471fbf..8d0674d82 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  9 01:35:19 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Tue Sep 10 14:20:09 1996  Tom Yu  <tlyu@mit.edu>
 
 	* kdb5_mkdums.M: remove ".so man1/header.doc"
diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in
index e011bc828..227c00dbc 100644
--- a/src/tests/create/Makefile.in
+++ b/src/tests/create/Makefile.in
@@ -1,11 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) 
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: kdb5_mkdums
 
-kdb5_mkdums: kdb5_mkdums.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_mkdums kdb5_mkdums.o $(LIBS)
-
-kdb5_mkdums.o:	$(srcdir)/kdb5_mkdums.c
+kdb5_mkdums: kdb5_mkdums.o $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o kdb5_mkdums kdb5_mkdums.o $(KDB5_LIBS) $(KRB5_BASE_LIBS)
 
 all:: kdb5_mkdums
 
diff --git a/src/tests/create/configure.in b/src/tests/create/configure.in
index f092073d2..2f106fc98 100644
--- a/src/tests/create/configure.in
+++ b/src/tests/create/configure.in
@@ -1,7 +1,5 @@
 AC_INIT(kdb5_mkdums.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-USE_KDB5_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/dejagnu/ChangeLog b/src/tests/dejagnu/ChangeLog
index 619475c72..eab6eeb6f 100644
--- a/src/tests/dejagnu/ChangeLog
+++ b/src/tests/dejagnu/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  9 01:38:26 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Wed Nov 20 16:01:34 1996  Barry Jaspan  <bjaspan@mit.edu>
 
 	* Makefile.in (check-): warn more loudly about unrun tests
diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in
index 50b97e7d4..7ed9762b9 100644
--- a/src/tests/dejagnu/Makefile.in
+++ b/src/tests/dejagnu/Makefile.in
@@ -1,6 +1,8 @@
 HAVE_RUNTEST = @RUNTEST@
 RUNTESTFLAGS =
 KRB5_RUN_ENV= @KRB5_RUN_ENV@
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all install::
 
@@ -17,8 +19,8 @@ check-runtest:: t_inetd site.exp
 
 CFLAGS = $(CCOPTS) $(DEFS)
 
-t_inetd:: t_inetd.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o t_inetd t_inetd.o $(LIBS)
+t_inetd:: t_inetd.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_inetd t_inetd.o $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) t_inetd t_inetd.o site.exp
diff --git a/src/tests/dejagnu/configure.in b/src/tests/dejagnu/configure.in
index b699e65e6..bdf362182 100644
--- a/src/tests/dejagnu/configure.in
+++ b/src/tests/dejagnu/configure.in
@@ -5,6 +5,5 @@ AC_CHECK_PROG(RUNTEST,runtest,runtest)
 AC_RETSIGTYPE
 CHECK_SIGNALS
 KRB5_RUN_FLAGS
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/gssapi/ChangeLog b/src/tests/gssapi/ChangeLog
index 57e51da62..bfdbc51ea 100644
--- a/src/tests/gssapi/ChangeLog
+++ b/src/tests/gssapi/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  9 01:40:15 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Sat Mar 16 07:24:03 1996  Ezra Peisach  <epeisach@mit.edu>
 
 	* configure.in: Add USE_ANAME
diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in
index fb0e6835f..6e75130e9 100644
--- a/src/tests/gssapi/Makefile.in
+++ b/src/tests/gssapi/Makefile.in
@@ -1,4 +1,6 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_AUTOCONF_H
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 SRCS= t_imp_name.c
 
@@ -6,11 +8,8 @@ OBJS= t_imp_name.o
 
 all:: t_imp_name
 
-LOCAL_LIBRARIES = -lgssapi_krb5
-DEPLOCAL_LIBRARIES = $(TOPLIBD)/gssapi/libgssapi_krb5.a
-
-t_imp_name: t_imp_name.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o t_imp_name t_imp_name.o $(LIBS)
+t_imp_name: t_imp_name.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o t_imp_name t_imp_name.o $(GSS_LIBS) $(KRB5_BASE_LIBS)
 
 clean::
 	$(RM) t_imp_name
diff --git a/src/tests/gssapi/configure.in b/src/tests/gssapi/configure.in
index a37fbd0d2..45cdb51c4 100644
--- a/src/tests/gssapi/configure.in
+++ b/src/tests/gssapi/configure.in
@@ -4,7 +4,5 @@ AC_CHECK_HEADERS(unistd.h stdlib.h)
 AC_CHECK_HEADER(string.h,AC_DEFINE(USE_STRING_H))
 AC_CONST
 AC_PROG_INSTALL
-USE_ANAME
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index c765a6748..f548db424 100644
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  9 01:45:03 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Fri Jan 19 23:00:37 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* kdc5_hammer.c: Remove krb5_kdc_default_options.
diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in
index a8f729a21..d3c2c8c9d 100644
--- a/src/tests/hammer/Makefile.in
+++ b/src/tests/hammer/Makefile.in
@@ -1,13 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) 
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: kdc5_hammer
 
-kdc5_hammer: kdc5_hammer.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdc5_hammer kdc5_hammer.o $(LIBS)
-
-kdc5_hammer.o:	$(srcdir)/kdc5_hammer.c
-
-all:: kdc5_hammer
+kdc5_hammer: kdc5_hammer.o $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o kdc5_hammer kdc5_hammer.o $(KRB5_BASE_LIBS)
 
 install::
 
diff --git a/src/tests/hammer/configure.in b/src/tests/hammer/configure.in
index a71a0b790..ee62c087a 100644
--- a/src/tests/hammer/configure.in
+++ b/src/tests/hammer/configure.in
@@ -1,6 +1,5 @@
 AC_INIT(kdc5_hammer.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/resolve/ChangeLog b/src/tests/resolve/ChangeLog
index 8aa9ad579..b8a9be080 100644
--- a/src/tests/resolve/ChangeLog
+++ b/src/tests/resolve/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  9 01:48:01 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Mon Mar 18 21:49:39 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* configure.in: Add KRB5_RUN_FLAGS
diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in
index 2f378db13..193f128e8 100644
--- a/src/tests/resolve/Makefile.in
+++ b/src/tests/resolve/Makefile.in
@@ -1,14 +1,15 @@
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES)
 RUN_SETUP = @KRB5_RUN_ENV@
-
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 OBJS=resolve.o
 SRCS=$(srcdir)/resolve.c
 
 all:: resolve
 
-resolve: $(OBJS) $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o resolve $(OBJS) $(LIBS)
+resolve: $(OBJS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o resolve $(OBJS) $(KRB5_BASE_LIBS)
 
 check:: resolve
 	$(RUN_SETUP) ./resolve
diff --git a/src/tests/resolve/configure.in b/src/tests/resolve/configure.in
index ec3429142..5a6f90db4 100644
--- a/src/tests/resolve/configure.in
+++ b/src/tests/resolve/configure.in
@@ -4,6 +4,5 @@ AC_HEADER_STDC
 AC_CHECK_FUNCS(strchr)
 AC_CHECK_HEADERS(sys/param.h sys/socket.h)
 KRB5_RUN_FLAGS
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index 96182d999..73540c6a5 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,8 @@
+Sun Feb  9 01:57:53 1997  Tom Yu  <tlyu@mit.edu>
+
+	* Makefile.in:
+	* configure.in: Update to new program build procedure.
+
 Thu May  2 21:16:40 1996  Richard Basch  <basch@lehman.com>
 
 	* kdb5_verify.c: fixed various abstraction violations where the
diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in
index ae167a1b6..3f7aadc73 100644
--- a/src/tests/verify/Makefile.in
+++ b/src/tests/verify/Makefile.in
@@ -1,13 +1,11 @@
 CFLAGS = $(CCOPTS) $(DEFS) 
+PROG_LIBPATH=-L$(TOPLIBD)
+PROG_RPATH=$(KRB5_LIBDIR)
 
 all:: kdb5_verify
 
-kdb5_verify: kdb5_verify.o $(DEPLIBS)
-	$(LD) $(LDFLAGS) $(LDARGS) -o kdb5_verify kdb5_verify.o $(LIBS)
-
-kdb5_verify.o:	$(srcdir)/kdb5_verify.c
-
-all:: kdb5_verify
+kdb5_verify: kdb5_verify.o $(KDB5_DEPLIBS) $(KRB5_BASE_DEPLIBS)
+	$(CC_LINK) -o kdb5_verify kdb5_verify.o $(KDB5_LIBS) $(KRB5_BASE_LIBS)
 
 install::
 
diff --git a/src/tests/verify/configure.in b/src/tests/verify/configure.in
index e0549957b..711a78b60 100644
--- a/src/tests/verify/configure.in
+++ b/src/tests/verify/configure.in
@@ -1,7 +1,5 @@
 AC_INIT(kdb5_verify.c)
 CONFIG_RULES
 AC_PROG_INSTALL
-USE_KDB5_LIBRARY
-KRB5_LIBRARIES
-V5_USE_SHARED_LIB
+KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE