diff options
| -rw-r--r-- | src/kadmin/testing/scripts/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/configure.in | 4 | ||||
| -rw-r--r-- | src/kadmin/testing/scripts/env-setup.shin | 8 |
3 files changed, 17 insertions, 2 deletions
diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index 43b627eb6..8006bd36e 100644 --- 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 427f1aac8..84277a42d 100644 --- 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 83bb522e3..330e88576 100644 --- 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 |