mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2026-04-09 08:21:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "build: check wayland-scanner version"

Browse source 
This reverts commit c2ce50b9d7.

Pushed by mistake. Sorry about that.
This commit is contained in:
Simon Ser 2020-01-13 19:32:44 +01:00
parent c2ce50b9d7
commit 555d3b8a9b
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/meson.build
View file

@ -55,7 +55,7 @@ pkgconfig.generate(
) )
if meson.is_cross_build() if meson.is_cross_build()
scanner_dep = dependency('wayland-scanner', native: true, version: '>=1.14.0') scanner_dep = dependency('wayland-scanner', native: true)
wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner'))
else else
wayland_scanner_for_build = wayland_scanner wayland_scanner_for_build = wayland_scanner

2
wayland-scanner.m4
View file

@ -1,7 +1,7 @@
AC_DEFUN([WAYLAND_SCANNER_RULES], [ AC_DEFUN([WAYLAND_SCANNER_RULES], [
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner >= 1.14.0]) PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner])
wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`
AC_SUBST([wayland_scanner]) AC_SUBST([wayland_scanner])