Portability: don't use LD_LIBRARY_PATH directly, but use libtool.

diff --git a/t/src/test_script b/t/src/test_script
index eebe7e672005bb349431c1fc270a0ddc6909c42e..1e21a52c0eedd25f5aae7cc94683db500e0cb2e0 100755 (executable)
--- a/t/src/test_script
+++ b/t/src/test_script
@@ -33,13 +33,13 @@ else
 fi
 
 builddir=`pwd`
+ltcmd="$srcdir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la"
 export GCONV_PATH=.:$GCONV_PATH
-export LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH
 ln -s $srcdir/../data/gedcom.enc .
 ln -s $builddir/../ansel/.libs/ANSI_Z39.47.so .
 ln -s $srcdir/../ansel/gconv-modules .
 rm -f core
-$GEDCOM_TESTENV $builddir/src/testgedcom $options $testfile
+$ltcmd $GEDCOM_TESTENV $builddir/src/testgedcom $options $testfile
 result=$?
 rm gedcom.enc
 rm ANSI_Z39.47.so

diff --git a/t/src/test_update b/t/src/test_update
index 7393494d826207ebdc73f19bd2d44c23e341403e..4e1050cc59850deeb7dba69d0c4a58b71bbc6def 100755 (executable)
--- a/t/src/test_update
+++ b/t/src/test_update
@@ -30,14 +30,14 @@ else
 fi
 
 builddir=`pwd`
+ltcmd="$srcdir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la"
 export GCONV_PATH=.:$GCONV_PATH
-export LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH
 ln -s $srcdir/../data/gedcom.enc .
 ln -s $srcdir/../data/new.ged .
 ln -s $builddir/../ansel/.libs/ANSI_Z39.47.so .
 ln -s $srcdir/../ansel/gconv-modules .
 rm -f core
-$GEDCOM_TESTENV $builddir/src/updatetest $options
+$ltcmd $GEDCOM_TESTENV $builddir/src/updatetest $options
 result=$?
 rm gedcom.enc
 rm new.ged