diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1996-10-16 01:46:54 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1996-10-16 01:46:54 +0000 |
| commit | e5db82c83feb7cf988019d901fd17303a7599bc3 (patch) | |
| tree | 826dca6f9b1469284dae7ddabe496dee66a23587 /src/kadmin | |
| parent | 5de44ef5dca2f01c7cdb7a33fd07526b0a6ecccd (diff) | |
| download | krb5-e5db82c83feb7cf988019d901fd17303a7599bc3.tar.gz krb5-e5db82c83feb7cf988019d901fd17303a7599bc3.tar.xz krb5-e5db82c83feb7cf988019d901fd17303a7599bc3.zip | |
* 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
Diffstat (limited to 'src/kadmin')
| -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 |