summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2015-03-23 17:49:23 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-03-24 20:49:32 +0000
commit248eb54eb6117cc5a863ba2deaa14c3bee0b5d41 (patch)
treed7271dc0c0fdfcf20a4bcd5f467d043fb0bef93d
parent726d99b19740dca6787ab819ab99bc9d942d80a6 (diff)
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: ced9425327b (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>
-rw-r--r--configure.ac4
-rw-r--r--m4/ax_check_python_mako_module.m42
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 08378f570e3..3e5b6f5b263 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,9 +123,7 @@ 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_RESULT(yes)
-else
+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
diff --git a/m4/ax_check_python_mako_module.m4 b/m4/ax_check_python_mako_module.m4
index ee68a7cdb05..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_RESULT(no)
AC_SUBST(acv_mako_found, 'no')
else
+ AC_MSG_RESULT(yes)
AC_SUBST(acv_mako_found, 'yes')
fi
])