* env-setup.shin (TOPLIBD): Support for build tree shared library

		environment setup. [krb5-admin/80]

	* configure.in (RBUILD): Pass in proper top of build tree (not
		.. path) as this is build tree independent.

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

diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog
index 43b627eb6df5d1f8093a9c5bd9026b287b4c7e6a..8006bd36e3a61f264c67227ecc98174e9124fe37 100644 (file)
--- a/src/kadmin/testing/scripts/ChangeLog
+++ b/src/kadmin/testing/scripts/ChangeLog
@@ -1,3 +1,10 @@
+Tue Oct 15 18:39:58 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * env-setup.shin: Support for build tree shared library
+               environment setup. [krb5-admin/80]
+
+       * configure.in (RBUILD): Pass in proper top of build tree (not
+               .. path) as this is build tree independent.
 Tue Oct 15 16:22:52 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * env-setup.shin: set $QUALNAME to the right path

diff --git a/src/kadmin/testing/scripts/configure.in b/src/kadmin/testing/scripts/configure.in
index 427f1aac8e999ffe7edacf2f2c2f3626c627c81e..84277a42d0d483ac1b8312a1b76cb92f784ca0e2 100644 (file)
--- a/src/kadmin/testing/scripts/configure.in
+++ b/src/kadmin/testing/scripts/configure.in
@@ -2,7 +2,9 @@ AC_INIT(init_db)
 CONFIG_RULES
 AC_PATH_PROG(PERL,perl)
 AC_PATH_PROG(EXPECT,expect)
+KRB5_RUN_FLAGS
+RBUILD=`pwd`/../../..
+AC_SUBST(RBUILD)
 dnl The following are substituted into env-setup.sh
-AC_SUBST(BUILDTOP)
 AC_SUBST(SRCTOP)
 V5_AC_OUTPUT_MAKEFILE( ,env-setup.sh:env-setup.shin)

diff --git a/src/kadmin/testing/scripts/env-setup.shin b/src/kadmin/testing/scripts/env-setup.shin
index 83bb522e3bd49761a82064b3db68d9e4ab2c7e47..330e88576474221bebcab7ce5566a88a01f5cf1a 100644 (file)
--- a/src/kadmin/testing/scripts/env-setup.shin
+++ b/src/kadmin/testing/scripts/env-setup.shin
@@ -11,11 +11,17 @@
 # Usage: env-setup.sh <command line>
 #
 
-TOP=@BUILDTOP@/kadmin
+TOP=@RBUILD@/kadmin
 STOP=@SRCTOP@/kadmin
 export TOP
 export STOP
 
+# The shared library run time setup
+TOPLIBD=@RBUILD@/lib
+# This converts $(TOPLIBD) to $TOPLIBD
+foo=`echo "@KRB5_RUN_ENV@" | sed -e 's/(//' -e 's/)//'` 
+eval $foo
+
 TESTDIR=$TOP/testing; export TESTDIR
 STESTDIR=$STOP/testing; export STESTDIR
 if [ "$K5ROOT" = "" ]; then