Import Assistant: Fix generation of variable names

[pspp] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index fae659ae3d076f7230cb945e2cd19211fa267818..f011d0849b59671a5770d52af50bcd09010c7669 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -7,6 +7,8 @@ ODF_READ_SUPPORT='@ODF_READ_SUPPORT@'
 PERL='@PERL@'
 WITH_PERL_MODULE='@WITH_PERL_MODULE@'
 host='@host@'
+PACKAGE_STRING='@PACKAGE_STRING@'
+PACKAGE_BUGREPORT='@PACKAGE_BUGREPORT@'
 
 PSQL_SUPPORT='@PSQL_SUPPORT@'
 if test "$PSQL_SUPPORT" = yes; then
@@ -34,5 +36,19 @@ export CHARSETALIASDIR
 GZIP=
 export GZIP
 
+WINEPREFIX=$HOME/.wine    # Work around the following kludge to keep wine happy
+export WINEPREFIX
+
+
 HOME=/nonexistent              # Kluge to make PSPP ignore $HOME/.pspprc.
 export HOME
+
+# Avoids error messages during tests if $TERM is set to an unknown terminal.
+TERM=; unset TERM
+
+pspp_diff=`which diff`
+if test X"$RUNNER" = Xwine; then
+    diff () {
+        $pspp_diff -w  "$@"
+    }
+fi