X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fatlocal.in;h=fae659ae3d076f7230cb945e2cd19211fa267818;hb=refs%2Fheads%2Fpivot-table2;hp=7bd713cdd2be0654985e24d884aed77241a6ef86;hpb=12594449b5aad90c16f26dc33b017f7385b4e4cb;p=pspp

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 7bd713cdd2..fae659ae3d 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,12 +1,12 @@
 # -*- shell-script -*-
+
+# Variables used internally by the testsuite.
+EXEEXT='@EXEEXT@'
+GNM_READ_SUPPORT='@GNM_READ_SUPPORT@'
+ODF_READ_SUPPORT='@ODF_READ_SUPPORT@'
 PERL='@PERL@'
-CHARSETALIASDIR="$abs_top_builddir/gl"
-export CHARSETALIASDIR
 WITH_PERL_MODULE='@WITH_PERL_MODULE@'
 host='@host@'
-GNM_SUPPORT='@GNM_SUPPORT@'
-GZIP=
-export GZIP
 
 PSQL_SUPPORT='@PSQL_SUPPORT@'
 if test "$PSQL_SUPPORT" = yes; then
@@ -14,4 +14,25 @@ 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.
+CHARSETALIASDIR="$abs_top_builddir/gl"
+export CHARSETALIASDIR
+
+GZIP=
+export GZIP
+
+HOME=/nonexistent		# Kluge to make PSPP ignore $HOME/.pspprc.
+export HOME