Portability fixes.

[gedcom-parse.git] / t / src / test_gom

diff --git a/t/src/test_gom b/t/src/test_gom
index fdb849f03932e8e30d81bd1c599b4ed5179a0a92..0dbcd62a47c7d3d82a2d362855f7981c5f530640 100755 (executable)
--- a/t/src/test_gom
+++ b/t/src/test_gom
@@ -35,20 +35,21 @@ else
 fi
 
 builddir=`pwd`
-export GCONV_PATH=.:$GCONV_PATH
-export LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$builddir/../gom/.libs:$LD_LIBRARY_PATH
+ltcmd="$builddir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la -dlopen $builddir/../gom/libgedcom_gom.la"
+GCONV_PATH=.:$GCONV_PATH
+export GCONV_PATH
 ln -s $srcdir/../data/gedcom.enc .
-ln -s $builddir/../ansel/.libs/ANSI_Z39.47.so .
-ln -s $srcdir/../ansel/gconv-modules .
+ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so .
+ln -s $srcdir/../iconv/glibc/gconv-modules .
 rm -f core
 if [ "$GOM_DMALLOC_TEST" = "" ]
 then
-  $GEDCOM_TESTENV $builddir/src/gomtest $options $testfile
+  $ltcmd $GEDCOM_TESTENV $builddir/src/gomtest $options $testfile
 else
   $dmalloc -b -l $GOM_DMALLOC_TEST -i 100 low > $dmalloc_tmp
   . $dmalloc_tmp
   rm $dmalloc_tmp
-  $GEDCOM_TESTENV $builddir/src/gomtest_static $options $testfile
+  $ltcmd $GEDCOM_TESTENV $builddir/src/gomtest_static $options $testfile
 fi
 result=$?
 rm gedcom.enc