diff options
| author | Björn Jacke <bj@sernet.de> | 2009-03-09 17:28:42 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-09 18:31:11 +0100 |
| commit | 0d2de5380d13d544c382e3626e3b84fbea4b70a7 (patch) | |
| tree | 7e73807404e907ae4e3f5eb7b54c3869f26596a8 | |
| parent | f992416e23c9baf0e20848ff3c12fcafe1d492aa (diff) | |
| download | samba-0d2de5380d13d544c382e3626e3b84fbea4b70a7.tar.gz samba-0d2de5380d13d544c382e3626e3b84fbea4b70a7.tar.bz2 samba-0d2de5380d13d544c382e3626e3b84fbea4b70a7.zip | |
use LIB_PATH_VAR in selftest.sh if we have it
if we have LIB_PATH_VAR we should use it, otherwise we'll unobtrusively
complain about not having it and use the most likely LD_LIBRARY_PATH.
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
| -rwxr-xr-x | source3/script/tests/selftest.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index 94621841f5..a430d01a0e 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -104,13 +104,14 @@ SAMBA4SHAREDDIR="$SAMBA4BINDIR/shared" export SAMBA4SHAREDDIR export SMBTORTURE4 -if test x"$LD_LIBRARY_PATH" != x""; then - LD_LIBRARY_PATH="$BINDIR:$SAMBA4SHAREDDIR:$LD_LIBRARY_PATH" -else - LD_LIBRARY_PATH="$BINDIR:$SAMBA4SHAREDDIR" +if [ -z "$LIB_PATH_VAR" ] ; then + echo "Warning: LIB_PATH_VAR not set. Using best guess LD_LIBRARY_PATH." >&2 + LIB_PATH_VAR=LD_LIBRARY_PATH + export LIB_PATH_VAR fi -echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" -export LD_LIBRARY_PATH + +eval $LIB_PATH_VAR=$BINDIR:$SAMBA4SHAREDDIR:\$$LIB_PATH_VAR +export $LIB_PATH_VAR ## ## verify that we were built with --enable-socket-wrapper |