[Mesa-stable] [PATCH 1/2] configure.ac: move AC_MSG_RESULT reportging back into the m4 macro
Samuel Iglesias Gonsálvez
siglesias at igalia.com
Mon Mar 23 23:14:39 PDT 2015
Thanks Emil!
Reviewed-by: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
Sam
On Monday 23 March 2015 17:49:23 Emil Velikov wrote:
> The one who does AC_MSG_CHECKING should provide the AC_MSG_RESULT.
>
> Fixed: ced9425327b (configure: Introduce new output variable to
> ax_check_python_mako_module.m4"
> Cc: Samuel Iglesias Gonsalvez <siglesias at igalia.com>
> Cc: "10.5" <mesa-stable at lists.freedesktop.org>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89328
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
> Strictly speaking not a hard requirement for 10.5, although the original
> commit which resolves the bug is missing the Cc and Bugzilla tags. This
> will allow us to kill two birds with one stone.
>
> -Emil
>
> configure.ac | 4 +---
> m4/ax_check_python_mako_module.m4 | 2 ++
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 08378f5..3e5b6f5 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 ee68a7c..7d9bb51 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
> ])
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.freedesktop.org/archives/mesa-stable/attachments/20150324/e5be418a/attachment.sig>
More information about the mesa-stable
mailing list