Building spice or spice-gtk from git requires python modules pyparsing
and six. Search for them in the both Python versions and set
the Python version accordingly.
---
intention behind this patch is to fix failing gitlab ci
---
m4/spice-deps.m4 | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 3b22422..243e614 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -155,15 +155,25 @@ AC_DEFUN([SPICE_CHECK_GLIB2], [
# tarballs so they are disabled by default.
#---------------------------
AC_DEFUN([SPICE_CHECK_PYTHON_MODULES], [
- AM_PATH_PYTHON
AC_ARG_ENABLE([python-checks],
AS_HELP_STRING([--enable-python-checks=@<:@yes/no@:>@],
[Enable checks for Python modules needed to build from
git @<:@default=no@:>@]),
[],
[enable_python_checks="no"])
if test "x$enable_python_checks" != "xno"; then
- AX_PYTHON_MODULE([six], [1])
- AX_PYTHON_MODULE([pyparsing], [1])
+ AS_IF([PYTHON=python3
+ AX_PYTHON_MODULE([six])
+ AX_PYTHON_MODULE([pypfarsing])
+ test "$HAVE_PYMOD_SIX" = "yes" && test "$HAVE_PYMOD_PYPARSING"
= "yes"],
+ [AM_PATH_PYTHON([3])],
+ [PYTHON=python2
+ AX_PYTHON_MODULE([six])
+ AX_PYTHON_MODULE([pyparsing])
+ test "$HAVE_PYMOD_SIX" = "yes" && test "$HAVE_PYMOD_PYPARSING"
= "yes"],
+ [AM_PATH_PYTHON([2])],
+ [AC_MSG_ERROR([Python modules six and pyparsing are required])])
+ else
+ AM_PATH_PYTHON
fi
])
--
2.10.2
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
