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>

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 94621841f55c1f1e60d7bab570f9dfd4c14e1cef..a430d01a0ee38e3270cc90412fc0ea47cc87c598 100755 (executable)
--- 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