meson.build: restore compatibility with meson in kirkstone

The version of meson in kirkstone doesn't yet have the "version" method
in output of find_program(), only in dependency(). The previous change
was too aggressive requiring too newer version of meson than what is
available in kirkstone, so restore the compatibility back.

Bug-AGL: SPEC-4578

Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Change-Id: I14bc5ce114f24d0fac85a4eddac34277e46970a8

diff --git a/homescreen/meson.build b/homescreen/meson.build
index 2402e6c..db2409d 100644 (file)
--- a/homescreen/meson.build
+++ b/homescreen/meson.build
@@ -19,6 +19,7 @@ if cpp.has_header(qpa_header, dependencies : qt5_dep)
   message('Found QtGui QPA header in ' + qpa_header_path)
 endif
 
+dep_scanner = dependency('wayland-scanner')
 prog_scanner = find_program('wayland-scanner')
 agl_compositor_dep = dependency('agl-compositor-0.0.21-protocols')
 dir_agl_compositor_base = agl_compositor_dep.get_variable(pkgconfig: 'pkgdatadir')
@@ -59,7 +60,7 @@ foreach proto: protocols
                         output_file = '@0@-server-protocol.h'.format(base_file)
                 else
                         output_file = '@0@-protocol.c'.format(base_file)
-                        if prog_scanner.version().version_compare('< 1.14.91')
+                        if dep_scanner.version().version_compare('< 1.14.91')
                                 output_type = 'code'
                         endif
                 endif