[Mesa-dev] [PATCH 3/3] build: Move wayland-scanner check into platform

[Dieter Nützel]

For the series:

Tested-by: Dieter Nützel <Dieter at nuetzel-hh.de>

at least on openSUSE Tumbleweed with 
wayland-protocols-devel-1.13-1.1.noarch removed.

Thanks!
Dieter

Am 23.02.2018 12:22, schrieb Daniel Stone:
> Also only check for wayland-scanner if building for the Wayland
> platform.
> 
> Signed-off-by: Daniel Stone <daniels at collabora.com>
> Fixes: bfa22266cd4d ("vulkan/wsi/wayland: Add support for zwp_dmabuf")
> Cc: Emil Velikov <emil.velikov at collabora.co.uk>
> Reported-by: Dieter Nützel <Dieter at nuetzel-hh.de>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105211
> ---
>  configure.ac | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index d8826cbb426..346c8130352 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1770,13 +1770,6 @@ if test "x$with_platforms" = xauto; then
>      with_platforms=$with_egl_platforms
>  fi
> 
> -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
> -        WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner
> wayland-scanner`,
> -        WAYLAND_SCANNER='')
> -if test "x$WAYLAND_SCANNER" = x; then
> -    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
> -fi
> -
>  # Do per platform setups and checks
>  platforms=`IFS=', '; echo $with_platforms`
>  for plat in $platforms; do
> @@ -1788,6 +1781,13 @@ for plat in $platforms; do
>          PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >=
> $WAYLAND_PROTOCOLS_REQUIRED])
>          WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir
> wayland-protocols`
> 
> +        PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
> +                          WAYLAND_SCANNER=`$PKG_CONFIG
> --variable=wayland_scanner wayland-scanner`,
> +                          WAYLAND_SCANNER='')
> +        if test "x$WAYLAND_SCANNER" = x; then
> +            AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
> +        fi
> +
>          if test "x$WAYLAND_SCANNER" = "x:"; then
>                  AC_MSG_ERROR([wayland-scanner is needed to compile
> the wayland platform])
>          fi