more work on datasets

[pspp] / tests / atlocal.in

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 4c2e0efd7f6b354eef954e5146a44b81f56f888c..29886a0cd22508023c75f272951961e945241787 100644 (file)
--- 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.
@@ -24,3 +38,6 @@ 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