X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=642448ef740b3745429ae5f58c29d1b9eeac0177;hb=58a3fe5c2923499160b270c7ef18a8004ee2f537;hp=a6c926901bcfbc7f7b20a323cd8364229fd1a4d6;hpb=93523a7f38bfe1ad5466fee50f1c7d73c4cafcd2;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index a6c9269..642448e 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c',
-  version: '0.0.13',
+  version: '0.0.16',
   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.16'
 pkgconfig = import('pkgconfig')
 
 cc = meson.get_compiler('c')
@@ -46,10 +46,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')
+agl_shell_desktop_xml = files('protocol/agl-shell-desktop.xml')
 xdg_shell_xml = join_paths(dir_wp_base, 'stable', 'xdg-shell', 'xdg-shell.xml')
 
 protocols = [
   { 'name': 'agl-shell', 'source': 'internal' },
+  { 'name': 'agl-shell-desktop', 'source': 'internal' },
   { 'name': 'xdg-shell', 'source': 'wp-stable' },
 ]
 
@@ -105,10 +107,11 @@ 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-7'),
+  libweston_dep,
   dependency('libweston-desktop-7'),
   local_dep,
 ]
@@ -117,14 +120,35 @@ srcs_agl_compositor = [
 	'src/main.c',
 	'src/desktop.c',
 	'src/layout.c',
+	'src/policy.c',
+	'src/policy-default.c',
 	'src/shell.c',
 	'shared/option-parser.c',
 	'shared/os-compatibility.c',
 	agl_shell_server_protocol_h,
+	agl_shell_desktop_server_protocol_h,
 	agl_shell_protocol_c,
+	agl_shell_desktop_protocol_c,
 	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)
 
@@ -156,6 +180,6 @@ pkgconfig.generate(
 )
 
 install_data(
-        [ agl_shell_xml ],
+        [ agl_shell_xml, agl_shell_desktop_xml ],
         install_dir: join_paths(dir_data, dir_data_agl_compositor)
 )