From bcdaf28dd4a4cd95b0cf6b7b5d8e578fcc07487f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim Rühsen?= Date: Tue, 4 Nov 2014 11:27:10 +0100 Subject: [PATCH] * configure.ac: check for python3 * Makefile.am: only use python test suite if python3 found On system without python3 the test suite will fail since the tests are designed for python3 only. --- ChangeLog | 5 +++++ Makefile.am | 5 ++++- configure.ac | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dc137ca..021d9af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-11-04 Tim Ruehsen + + * configure.ac: check for python3 + * Makefile.am: only use python test suite if python3 found + 2014-11-01 Darshit Shah * configure.ac: Fix check for libpsl diff --git a/Makefile.am b/Makefile.am index a059794..8bf7def 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,10 @@ distuninstallcheck_listfiles = find . -type f | \ ACLOCAL_AMFLAGS = -I m4 # subdirectories in the distribution -SUBDIRS = lib src doc po tests util testenv +SUBDIRS = lib src doc po tests util +if HAVE_PYTHON + SUBDIRS += testenv +endif EXTRA_DIST = ChangeLog.README MAILING-LIST \ msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \ diff --git a/configure.ac b/configure.ac index 01d3eef..23dbda3 100644 --- a/configure.ac +++ b/configure.ac @@ -136,6 +136,12 @@ AC_AIX gl_EARLY dnl +dnl Find python3 +dnl +AM_PATH_PYTHON([3.0],,[:]) +AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) + +dnl dnl Gettext dnl AM_GNU_GETTEXT([external],[need-ngettext]) -- 2.1.1