diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | m4/ax_check_python_mako_module.m4 | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index f596a9d2d31..20e6d629a44 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,7 @@ XCBDRI2_REQUIRED=1.8 XCBGLX_REQUIRED=1.8.1 XSHMFENCE_REQUIRED=1.1 XVMC_REQUIRED=1.0.6 +PYTHON_MAKO_REQUIRED=0.3.4 dnl Check for progs AC_PROG_CPP @@ -113,7 +114,10 @@ if test "x$INDENT" != "xcat"; then fi fi -AX_CHECK_PYTHON_MAKO_MODULE(0.3.4) +AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED) +if test -n "$PYTHON2" -a "x$acv_mako_found" != "xyes"; then + AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found]) +fi AC_PROG_INSTALL diff --git a/m4/ax_check_python_mako_module.m4 b/m4/ax_check_python_mako_module.m4 index 2fc029b9a2b..7d9bb511c09 100644 --- a/m4/ax_check_python_mako_module.m4 +++ b/m4/ax_check_python_mako_module.m4 @@ -54,8 +54,10 @@ else: " | $PYTHON2 - if test $? -ne 0 ; then - AC_MSG_ERROR(mako $1 or later is required.) + AC_MSG_RESULT(no) + AC_SUBST(acv_mako_found, 'no') else - AC_MSG_RESULT(yes) + AC_MSG_RESULT(yes) + AC_SUBST(acv_mako_found, 'yes') fi ]) |