build: check wayland-scanner version
authorSimon Ser <contact@emersion.fr>
Mon, 13 Jan 2020 18:27:19 +0000 (19:27 +0100)
committerSimon Ser <contact@emersion.fr>
Thu, 16 Jan 2020 16:25:06 +0000 (17:25 +0100)
We need the --strict flag, released in wayland 1.14.0.

Signed-off-by: Simon Ser <contact@emersion.fr>
src/meson.build
wayland-scanner.m4

index 7945965..3e8c9bf 100644 (file)
@@ -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
index 4e4222a..2b222e8 100644 (file)
@@ -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])