Check for python interpreter at configure time and document the requirement.

diff --git a/INSTALL b/INSTALL
index d4f982e193a14e92782cc872eb1bf4feb609cf74..25e9a6623604dae4f8699fe0ea3d6113405552a5 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -60,6 +60,10 @@ The following packages are required to install PSPP:
     * Perl (http://www.perl.org/), version 5.005_03 or later.  Perl is
       required during build but not after installation.
 
+    * Python (https://python.org/), version 2.7.  Some tests require
+      Python; if it is missing, those tests will be skipped.  PSPP
+      does not otherwise require Python.
+
     * iconv, which should be installed as part of a Unix-like system.
       If you don't have a version already, you can install GNU
       libiconv (http://www.gnu.org/software/libiconv/).

diff --git a/acinclude.m4 b/acinclude.m4
index 292404723033bd06f84955e706b25aef2af96da9..e6c1adbf3d0c92302dc833549c0e27ff5d4c543b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -43,6 +43,11 @@ AC_DEFUN([PSPP_PERL],
   AC_SUBST([VERSION_FOR_PERL])
 ])
 
+dnl Check that Python 2 or 3 is available.
+AC_DEFUN([PSPP_PYTHON],
+  [AC_ARG_VAR([PYTHON], [Python 2 or 3 interpreter])
+   AC_CHECK_PROGS([PYTHON], [python python2 python3], [none])])
+
 dnl PSPP_CHECK_CC_OPTION([OPTION], [ACTION-IF-ACCEPTED], [ACTION-IF-REJECTED])
 dnl Check whether the given C compiler OPTION is accepted.
 dnl If so, execute ACTION-IF-ACCEPTED, otherwise ACTION-IF-REJECTED.

diff --git a/configure.ac b/configure.ac
index 7f2f4d167680313290f57654229d321d615c560b..cc0cfff67eb02e6acfb32e10dc21f560e01b2f6b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,7 @@ AM_CONDITIONAL(cc_is_gcc, test x"$GCC" = x"yes" )
 
 PSPP_CC_FOR_BUILD
 PSPP_PERL
+PSPP_PYTHON
 
 dnl Disable automatic po/ support, because PSPP provides its own po/ support.
 AC_PROVIDE([AM_PO_SUBDIRS])

diff --git a/tests/atlocal.in b/tests/atlocal.in
index 041cf289a806e8b9a3aac165f7fadd8d4d989438..2a8a0eafbe014bc008ffaf06f39f33642f40a6cf 100644 (file)
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -21,6 +21,7 @@
 # Variables used internally by the testsuite.
 EXEEXT='@EXEEXT@'
 PERL='@PERL@'
+PYTHON='@PYTHON@'
 WITH_PERL_MODULE='@WITH_PERL_MODULE@'
 host='@host@'
 PACKAGE_STRING='@PACKAGE_STRING@'

diff --git a/tests/data/data-in.at b/tests/data/data-in.at
index f5d6d4763ea7dcdff1eee12baad2304dbce94a48..d27b7fe86ee2433fc6d8899cd996c3441798f275 100644 (file)
--- a/tests/data/data-in.at
+++ b/tests/data/data-in.at
@@ -255,7 +255,8 @@ AT_CLEANUP
 
 AT_SETUP([DATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py date d-m-y])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py date d-m-y])
 AT_FAIL_IF([test ! -s date.sps || test ! -s date.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv date.sps])
 AT_CHECK([cat date.output], [0], [expout])
@@ -263,7 +264,8 @@ AT_CLEANUP
 
 AT_SETUP([ADATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py adate m-d-y])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py adate m-d-y])
 AT_FAIL_IF([test ! -s adate.sps || test ! -s adate.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv adate.sps])
 AT_CHECK([cat adate.output], [0], [expout])
@@ -271,7 +273,8 @@ AT_CLEANUP
 
 AT_SETUP([EDATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py edate d-m-y])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py edate d-m-y])
 AT_FAIL_IF([test ! -s edate.sps || test ! -s edate.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv edate.sps])
 AT_CHECK([cat edate.output], [0], [expout])
@@ -279,7 +282,8 @@ AT_CLEANUP
 
 AT_SETUP([JDATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py jdate j])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py jdate j])
 AT_FAIL_IF([test ! -s jdate.sps || test ! -s jdate.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv jdate.sps])
 AT_CHECK([cat jdate.output], [0], [expout])
@@ -287,7 +291,8 @@ AT_CLEANUP
 
 AT_SETUP([SDATE input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py sdate y-m-d])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py sdate y-m-d])
 AT_FAIL_IF([test ! -s sdate.sps || test ! -s sdate.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv sdate.sps])
 AT_CHECK([cat sdate.output], [0], [expout])
@@ -295,7 +300,8 @@ AT_CLEANUP
 
 AT_SETUP([QYR input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py qyr qQy])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py qyr qQy])
 AT_FAIL_IF([test ! -s qyr.sps || test ! -s qyr.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv qyr.sps])
 AT_CHECK([cat qyr.output], [0], [expout])
@@ -303,7 +309,8 @@ AT_CLEANUP
 
 AT_SETUP([MOYR input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py moyr m-y])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py moyr m-y])
 AT_FAIL_IF([test ! -s moyr.sps || test ! -s moyr.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv moyr.sps])
 AT_CHECK([cat moyr.output], [0], [expout])
@@ -311,7 +318,8 @@ AT_CLEANUP
 
 AT_SETUP([WKYR input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py wkyr wWy])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py wkyr wWy])
 AT_FAIL_IF([test ! -s wkyr.sps || test ! -s wkyr.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv wkyr.sps])
 AT_CHECK([cat wkyr.output], [0], [expout])
@@ -319,7 +327,8 @@ AT_CLEANUP
 
 AT_SETUP([DATETIME input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py datetime "d-m-y +H:M" "d-m-y +H:M:S"])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py datetime "d-m-y +H:M" "d-m-y +H:M:S"])
 AT_FAIL_IF([test ! -s datetime.sps || test ! -s datetime.input || \
             test ! -s expout])
 AT_CHECK([pspp -O format=csv datetime.sps])
@@ -328,7 +337,8 @@ AT_CLEANUP
 
 AT_SETUP([YMDHMS input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-date-input.py ymdhms "y-m-d +H:M" "y-m-d +H:M:S"])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-date-input.py ymdhms "y-m-d +H:M" "y-m-d +H:M:S"])
 AT_FAIL_IF([test ! -s ymdhms.sps || test ! -s ymdhms.input || \
             test ! -s expout])
 AT_CHECK([pspp -O format=csv ymdhms.sps])
@@ -337,7 +347,8 @@ AT_CLEANUP
 
 AT_SETUP([MTIME input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-time-input.py mtime +M:S])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-time-input.py mtime +M:S])
 AT_FAIL_IF([test ! -s mtime.sps || test ! -s mtime.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv mtime.sps])
 AT_CHECK([cat mtime.output], [0], [expout])
@@ -345,7 +356,8 @@ AT_CLEANUP
 
 AT_SETUP([TIME input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-time-input.py time +H:M +H:M:S])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-time-input.py time +H:M +H:M:S])
 AT_FAIL_IF([test ! -s time.sps || test ! -s time.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv time.sps])
 AT_CHECK([cat time.output], [0], [expout])
@@ -353,7 +365,8 @@ AT_CLEANUP
 
 AT_SETUP([DTIME input format])
 AT_KEYWORDS([data-in])
-AT_CHECK([python $top_srcdir/tests/data/test-time-input.py dtime  '+D H:M' '+D H:M:S'])
+AT_SKIP_IF([test "$PYTHON" = none])
+AT_CHECK([$PYTHON $top_srcdir/tests/data/test-time-input.py dtime  '+D H:M' '+D H:M:S'])
 AT_FAIL_IF([test ! -s dtime.sps || test ! -s dtime.input || test ! -s expout])
 AT_CHECK([pspp -O format=csv dtime.sps])
 AT_CHECK([cat dtime.output], [0], [expout])