X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=37eb26a68916994b27d5324cd27eda0ba1a8447e;hb=dbba1adda7fd9aaaa46263d8c878132a523327e4;hp=e3a6631fd8a7aa30d7ff4f4e4db3b5d0864778d2;hpb=357c5a034a89dc227d671e63e8c10c4c62f9201e;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index e3a6631..37eb26a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c',
-  version: '0.0.13',
+  version: '0.0.15',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
@@ -10,7 +10,7 @@ project('agl-compositor',
 )
 
 config_h = configuration_data()
-agl_compositor_version = '0.0.13'
+agl_compositor_version = '0.0.15'
 pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
@@ -42,7 +42,7 @@ endforeach
 dep_libsystemd = dependency('libsystemd', required: false)
 dep_scanner = dependency('wayland-scanner', native: true)
 prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
-dep_wp = dependency('wayland-protocols', version: '>= 1.12')
+dep_wp = dependency('wayland-protocols', version: '>= 1.18')
 dir_wp_base = dep_wp.get_pkgconfig_variable('pkgdatadir')
 
 agl_shell_xml = files('protocol/agl-shell.xml')
@@ -105,11 +105,12 @@ endif
 dir_data = join_paths(prefix_path, get_option('datadir'))
 dir_data_agl_compositor = join_paths('agl-compositor', 'protocols')
 dir_data_pc = join_paths(dir_data, 'pkgconfig')
+libweston_dep = dependency('libweston-7')
 
 deps_libweston = [
   dependency('wayland-server'),
-  dependency('libweston-6'),
-  dependency('libweston-desktop-6'),
+  libweston_dep,
+  dependency('libweston-desktop-7'),
   local_dep,
 ]
 
@@ -125,6 +126,23 @@ srcs_agl_compositor = [
 	xdg_shell_protocol_c,
 ]
 
+# From meson documentation:
+# In order to look for headers in a specific directory you can use args :
+# '-I/extra/include/dir, but this should only be used in exceptional cases for
+# includes that can't be detected via pkg-config and passed via dependencies.
+if libweston_dep.found()
+  if not prefix_path.contains('/usr')
+    dir_path_x11_backend = join_paths(prefix_path, 'include', 'libweston-7', 'libweston', 'backend-x11.h')
+  else
+    dir_path_x11_backend = join_paths('libweston-7', 'libweston', 'backend-x11.h')
+  endif
+
+  # do the test
+  if cc.has_header(dir_path_x11_backend)
+    config_h.set('HAVE_BACKEND_X11', 1)
+  endif
+endif
+
 if dep_libsystemd.found()
   config_h.set('HAVE_SYSTEMD', 1)