X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fatlocal.in;h=f011d0849b59671a5770d52af50bcd09010c7669;hb=400c90fe0e7684dac41663389f2060d19c0667d0;hp=b30709d2f76f0672bc0940e65187e46f87b055ec;hpb=4593b60bad64b5a1e69ca1bf794b01513bf9b816;p=pspp

diff --git a/tests/atlocal.in b/tests/atlocal.in
index b30709d2f7..f011d0849b 100644
--- 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,8 +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