diff options
| author | Samuel Iglesias Gonsalvez <siglesias@igalia.com> | 2015-03-02 10:49:31 +0100 |
|---|---|---|
| committer | Samuel Iglesias Gonsalvez <siglesias@igalia.com> | 2015-03-06 09:39:41 +0100 |
| commit | ced9425327be6cb557a4a1217a1dac29b18d1a09 (patch) | |
| tree | 1d96abb234bbbbf6c5e4348ed8279a42b335f484 | |
| parent | 0dfec59a2785cf7a87ee5128889ecebe810b611b (diff) | |
configure: Introduce new output variable to ax_check_python_mako_module.m4
This output variables gives more flexibility for future changes
in autoconf to detect if it is needed to auto-generate files and
check for the auto-generation dependencies.
It is still returning error when Python is not installed.
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Reviewed-by: Kai Wasserbäch <kai@dev.carbon-project.org>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | m4/ax_check_python_mako_module.m4 | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ad64df0123..90c7737148 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,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 @@ -114,7 +115,12 @@ 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_RESULT(yes) +else + 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 2fc029b9a2..ee68a7cdb0 100644 --- a/m4/ax_check_python_mako_module.m4 +++ b/m4/ax_check_python_mako_module.m4 @@ -54,8 +54,8 @@ else: " | $PYTHON2 - if test $? -ne 0 ; then - AC_MSG_ERROR(mako $1 or later is required.) + AC_SUBST(acv_mako_found, 'no') else - AC_MSG_RESULT(yes) + AC_SUBST(acv_mako_found, 'yes') fi ]) |