X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fatlocal.in;h=29886a0cd22508023c75f272951961e945241787;hb=89cbb0a7f4f31bc826621ffff9138fc4743f2b11;hp=20234aaf570ab679416ad1e971480420c7d2ddef;hpb=79df5d5ebf834a3f768fe8ca2f8eb8b51abe9be8;p=pspp

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 20234aaf57..29886a0cd2 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,10 +2,13 @@
 
 # Variables used internally by the testsuite.
 EXEEXT='@EXEEXT@'
-GNM_SUPPORT='@GNM_SUPPORT@'
+GNM_READ_SUPPORT='@GNM_READ_SUPPORT@'
+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
@@ -13,6 +16,17 @@ if test "$PSQL_SUPPORT" = yes; then
     : ${PG_DBASE:=pspptest}
     : ${PG_PORT:=6543}
     : ${PG_PATH:=`$PG_CONFIG --bindir`}
+
+    # PSQL_SUPPORT indicates that PSPP was built against the PostgreSQL client
+    # library, but it does not mean that the PostgreSQL utilities are
+    # installed.  So check for them and turn off PSQL_SUPPORT if they are not
+    # available.
+    if (PATH=$PG_PATH:$PATH; export PATH; initdb --version) >/dev/null 2>&1
+    then
+	:
+    else
+	PSQL_SUPPORT=no
+    fi
 fi
 
 # Variables used by programs invoked by the testsuite.
@@ -21,3 +35,9 @@ export CHARSETALIASDIR
 
 GZIP=
 export GZIP
+
+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