From fab3cb3bfedd649d668e37d81b90c3dbad9f4fad Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 13 Jan 2020 19:27:19 +0100 Subject: [PATCH] build: check wayland-scanner version We need the --strict flag, released in wayland 1.14.0. Signed-off-by: Simon Ser --- src/meson.build | 2 +- wayland-scanner.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meson.build b/src/meson.build index 7945965..3e8c9bf 100644 --- a/src/meson.build +++ b/src/meson.build @@ -55,7 +55,7 @@ pkgconfig.generate( ) if meson.is_cross_build() - scanner_dep = dependency('wayland-scanner', native: true) + scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) else wayland_scanner_for_build = wayland_scanner diff --git a/wayland-scanner.m4 b/wayland-scanner.m4 index 4e4222a..2b222e8 100644 --- a/wayland-scanner.m4 +++ b/wayland-scanner.m4 @@ -1,7 +1,7 @@ AC_DEFUN([WAYLAND_SCANNER_RULES], [ PKG_PROG_PKG_CONFIG - PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner]) + PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner >= 1.14.0]) wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` AC_SUBST([wayland_scanner]) -- 2.7.4