From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 23 Mar 2015 17:49:24 +0000 (+0000)
Subject: configure.ac: error out if python/mako is not found when required
X-Git-Tag: android-x86-6.0-r1~10906
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4008975e6f4b2e15fceed4f07d8ec763dd0949d1;p=android-x86%2Fexternal-mesa.git

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 <mattst88@gmail.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/configure.ac b/configure.ac
index 3e5b6f5b263..3d8e0c61f26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,8 +123,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