mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-10 10:20:20 +01:00
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> (cherry picked from commitced9425327) Squashed with commit configure.ac: move AC_MSG_RESULT reporting back into the m4 macro The one who does AC_MSG_CHECKING should provide the AC_MSG_RESULT. Fixes:ced9425327(configure: Introduce new output variable to ax_check_python_mako_module.m4" Cc: "10.5" <mesa-stable@lists.freedesktop.org> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89328 Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com> (cherry picked from commit248eb54eb6)
This commit is contained in:
parent
d83d2ea9a6
commit
e98909b056
2 changed files with 9 additions and 3 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
])
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue