[Mesa-dev] [PATCH 3/4] configure: rework wayland_scanner handling(fix make distcheck)

[Kristian Høgsberg]

On Tue, Feb 10, 2015 at 8:08 AM, Emil Velikov <emil.l.velikov at gmail.com> wrote:
> Currently having the wayland-scanner is optional, which causes problems
> when autotools parses through the makefiles, and tries to generate all
> the BUILT_SOURCES.
>
> As the config option --with-egl-platform=wayland is not the default, we
> won't end up setting the WAYLAND_SCANNER variable, which in turn will
> cause some files to not get generated.
>
> There has been a wayland-scanner package as of wayland 1.2 which
> provides a variable for the scanner binary, so let's use that one and
> fall back to manually searching via AC_PATH_PROG when needed.
>
> Cc: "10.5" <mesa-stable at lists.freedestkop.org>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

Looks good to me.

Reviewed-by: Kristian Høgsberg <krh at bitplanet.net>

> ---
>  configure.ac | 13 ++++++++++---
>  1 file changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index c2d775e..155f496 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1730,6 +1730,13 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
>      AC_MSG_ERROR([cannot build egl state tracker without EGL library])
>  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-EGL platform setups and checks
>  egl_platforms=`IFS=', '; echo $with_egl_platforms`
>  for plat in $egl_platforms; do
> @@ -1737,9 +1744,9 @@ for plat in $egl_platforms; do
>         wayland)
>                 PKG_CHECK_MODULES([WAYLAND], [wayland-client >= $WAYLAND_REQUIRED wayland-server >= $WAYLAND_REQUIRED])
>
> -                WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client`
> -                AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],,
> -                             [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH])
> +               if test "x$WAYLAND_SCANNER" = x; then
> +                       AC_MSG_ERROR([wayland-scanner is needed to compile the wayland egl platform])
> +               fi
>                 ;;
>
>         x11)
> --
> 2.2.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev