diff options
| author | Simon Ser <contact@emersion.fr> | 2020-01-13 19:27:19 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2020-01-13 19:31:50 +0100 |
| commit | c2ce50b9d7bd470c2fe8faa4b0d996fca0fcbbaa (patch) | |
| tree | cabc044a52d5290e9424bb9159adfcac1e1a192b | |
| parent | display-test: Remove unused variables (diff) | |
| download | wayland-c2ce50b9d7bd470c2fe8faa4b0d996fca0fcbbaa.tar wayland-c2ce50b9d7bd470c2fe8faa4b0d996fca0fcbbaa.tar.gz wayland-c2ce50b9d7bd470c2fe8faa4b0d996fca0fcbbaa.tar.bz2 wayland-c2ce50b9d7bd470c2fe8faa4b0d996fca0fcbbaa.tar.lz wayland-c2ce50b9d7bd470c2fe8faa4b0d996fca0fcbbaa.tar.xz wayland-c2ce50b9d7bd470c2fe8faa4b0d996fca0fcbbaa.tar.zst wayland-c2ce50b9d7bd470c2fe8faa4b0d996fca0fcbbaa.zip | |
build: check wayland-scanner version
We need the --strict flag, released in wayland 1.14.0.
Signed-off-by: Simon Ser <contact@emersion.fr>
| -rw-r--r-- | src/meson.build | 2 | ||||
| -rw-r--r-- | wayland-scanner.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/meson.build b/src/meson.build index 26e5269..7421a8d 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]) |