Merge of libhack_branch

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

5 files changed, 37 insertions, 20 deletions

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index bfc97a8..c21053d 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 ae50130..d15c81f 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 698414a..f011d93 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 a650fc3..cc58358 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 911c0d6..6c6d32f 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