Module: Mesa Branch: 10.5 Commit: b3bb6b19637561171f286af7342266cac63b8fcd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b3bb6b19637561171f286af7342266cac63b8fcd
Author: Emil Velikov <[email protected]> Date: Mon Mar 23 17:49:24 2015 +0000 configure.ac: error out if python/mako is not found when required In case of using a distribution tarball (or a dirty git tree) one can have the generated sources locally. Make configure.ac error out otherwise, to alert that about the unmet requirement(s) of python/mako. v2: Check only for a single file for each dependency. Suggested-by: Matt Turner <[email protected]> Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Matt Turner <[email protected]> (cherry picked from commit 4008975e6f4b2e15fceed4f07d8ec763dd0949d1) --- configure.ac | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 20e6d62..101cf66 100644 --- a/configure.ac +++ b/configure.ac @@ -115,8 +115,17 @@ if test "x$INDENT" != "xcat"; then fi 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]) + +if test -z "$PYTHON2"; then + if test ! -f "$srcdir/src/util/format_srgb.c"; then + AC_MSG_ERROR([Python not found - unable to generate sources]) + fi +else + if test "x$acv_mako_found" = xno; then + if test ! -f "$srcdir/src/mesa/main/format_unpack.c"; then + AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found]) + fi + fi fi AC_PROG_INSTALL _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
