From 6ab80a5dddcbf61cd6b9ce1d68f323153a64a544 Mon Sep 17 00:00:00 2001
From: Thien-Thi Nguyen <ttn@gnuvola.org>
Date: Tue, 5 Feb 2002 11:12:40 +0000
Subject: [PATCH] (srcdir): Delete var. (top_builddir, top_srcdir, guile_opts):
 New vars. (GUILE_LOAD_PATH): No longer include $top_srcdir.

Use "set -e".
No longer set LTDL_LIBRARY_PATH.
Use ${top_srcdir}/pre-inst-guile instead of libguile/guile.
---
 check-guile.in | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/check-guile.in b/check-guile.in
index 126550a0c..547a93753 100644
--- a/check-guile.in
+++ b/check-guile.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Usage: check-guile [-i GUILE-INTERPRETER] [GUILE-TEST-ARGS]
-# If `-i GUILE-INTERPRETER' is omitted, use libguile/guile.
+# If `-i GUILE-INTERPRETER' is omitted, use ${top_srcdir}/pre-inst-guile.
 # See test-suite/guile-test for documentation on GUILE-TEST-ARGS.
 #
 # Example invocations:
@@ -9,27 +9,30 @@
 # ./check-guile -i /usr/local/bin/guile
 # ./check-guile -i /usr/local/bin/guile numbers.test
 
+set -e
+
 # this script runs in the top-level build-dir.
-srcdir=@srcdir@
-TEST_SUITE_DIR=$srcdir/test-suite
+top_builddir=`pwd`
+top_srcdir=@top_srcdir@
+
+TEST_SUITE_DIR=${top_srcdir}/test-suite
 
 if [ x"$1" = x-i ] ; then
     guile=$2
+    guile_opts=
     shift
     shift
-    GUILE_LOAD_PATH=$TEST_SUITE_DIR
 else
-    guile=libguile/guile
-    GUILE_LOAD_PATH=$srcdir:$TEST_SUITE_DIR
-    LTDL_LIBRARY_PATH=`pwd`/srfi:${LTDL_LIBRARY_PATH}
+    guile=${top_srcdir}/pre-inst-guile
+    guile_opts="${top_builddir}"
 fi
+
+GUILE_LOAD_PATH=$TEST_SUITE_DIR
 export GUILE_LOAD_PATH
-export LTDL_LIBRARY_PATH
 
 if [ -f "$guile" -a -x "$guile" ] ; then
     echo Testing $guile ... "$@"
     echo with GUILE_LOAD_PATH=$GUILE_LOAD_PATH
-    echo with LTDL_LIBRARY_PATH=$LTDL_LIBRARY_PATH
 else
     echo ERROR: Cannot execute $guile
     exit 1
@@ -37,9 +40,12 @@ fi
 
 # documentation searching ignores GUILE_LOAD_PATH.
 if [ ! -f guile-procedures.txt ] ; then
-   ln -s libguile/guile-procedures.txt .
+   @LN_S@ libguile/guile-procedures.txt .
 fi
 
-exec "$guile" -e main -s "$TEST_SUITE_DIR/guile-test" --test-suite "$TEST_SUITE_DIR/tests" --log-file check-guile.log "$@"
+exec $guile $guile_opts \
+    -e main -s "$TEST_SUITE_DIR/guile-test" \
+    --test-suite "$TEST_SUITE_DIR/tests" \
+    --log-file check-guile.log "$@"
 
 # check-guile ends here