From 42c7b9e5e893cd6b49f1e109418516a38dd10389 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 8 May 2017 11:35:17 +0100 Subject: [PATCH] configure: enforce presence of python for build The API docs extractor, ESX code generator and keycodemapdb tools rely on python. Historically every platform that this present, but with switch to Python3 by default, we're increasingly seeing installs without a /usr/bin/python. This tightens up the check during configure, so it exits immediately if python is missing, rather than leaving an empty $(PYTHON) make variable which leads to more obscure errors later. Also add it as a build dep for Mingw, since Fedora build roots no longer get python2 by default. This was not previously a major problem, since both ESX & API generated files were included in EXTRA_DIST, but the keycodemapdb generated files are not, so we require python all the time now. Signed-off-by: Daniel P. Berrange --- configure.ac | 5 ++++- mingw-libvirt.spec.in | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5f7a07a2a6..0b564a0300 100644 --- a/configure.ac +++ b/configure.ac @@ -624,9 +624,12 @@ fi dnl Allow perl/python overrides AC_PATH_PROGS([PYTHON], [python2 python]) +if test -z "$PYTHON"; then + AC_MSG_ERROR(['python' or 'python2' binary is required to build libvirt]) +fi AC_PATH_PROG([PERL], [perl]) if test -z "$PERL"; then - AC_MSG_ERROR([Failed to find perl.]) + AC_MSG_ERROR(['perl' binary is required to build libvirt]) fi LIBVIRT_ARG_WITH([TEST_SUITE], [build test suite by default], [check]) diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index dec799b40a..302f66396e 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -54,6 +54,7 @@ BuildRequires: mingw64-portablexdr BuildRequires: pkgconfig # Need native version for msgfmt BuildRequires: gettext +BuildRequires: python BuildRequires: perl BuildRequires: perl(Getopt::Long) %if 0%{?enable_autotools}