compositor: Avoid compiler warning and build failure

[src/agl-compositor.git] / meson.build

diff --git a/meson.build b/meson.build
index 2079fb1..0817c9d 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('agl-compositor',
   'c','cpp',
-  version: '0.0.21',
+  version: '0.0.23',
   default_options: [
     'warning_level=3',
     'c_std=gnu99',
@@ -42,7 +42,6 @@ foreach func: optional_libc_funcs
 endforeach
 
 dep_libsystemd = dependency('libsystemd', required: false)
-dep_libsmack = dependency('libsmack', required: false)
 dep_scanner = dependency('wayland-scanner')
 prog_scanner = find_program(dep_scanner.get_pkgconfig_variable('wayland_scanner'))
 dep_wp = dependency('wayland-protocols', version: '>= 1.18')
@@ -170,14 +169,17 @@ if libweston_dep.found()
     if not prefix_path.contains('/usr')
       dir_path_x11_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-x11.h')
       dir_path_headless_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-headless.h')
+      dir_path_rdp_backend = join_paths(prefix_path, 'include', libweston_version, 'libweston', 'backend-rdp.h')
     else
       dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
-      dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-headless.h')
+      dir_path_headless_backend = join_paths(libweston_version, 'libweston', 'backend-headless.h')
+      dir_path_rdp = join_paths(libweston_version, 'libweston', 'backend-rdp.h')
     endif
   else
     message('Building with cross environment')
     dir_path_x11_backend = join_paths(libweston_version, 'libweston', 'backend-x11.h')
     dir_path_headless_backend = join_paths(libweston_version, 'libweston', 'backend-headless.h')
+    dir_path_rdp_backend = join_paths(libweston_version, 'libweston', 'backend-rdp.h')
   endif
 
   # do the test
@@ -190,6 +192,11 @@ if libweston_dep.found()
     config_h.set('HAVE_BACKEND_HEADLESS', 1)
     message('Building with headless backend')
   endif
+
+  if cc.has_header(dir_path_rdp_backend)
+    config_h.set('HAVE_BACKEND_RDP', 1)
+    message('Building with RDP backend')
+  endif
 endif
 
 if dep_libsystemd.found()
@@ -206,9 +213,11 @@ if deps_remoting.length() == depnames.length()
   message('Found remoting depends, enabling remoting')
 endif
 
-if dep_libsmack.found()
-  config_h.set('HAVE_SMACK', 1)
-  deps_libweston += dep_libsmack
+if get_option('xwayland')
+        config_h.set('BUILD_XWAYLAND', '1')
+
+        srcs_agl_compositor += 'src/xwayland.c'
+        config_h.set_quoted('XSERVER_PATH', get_option('xwayland-path'))
 endif
 
 dir_module_agl_compositor = join_paths(join_paths(prefix_path, get_option('libdir')), 'agl-compositor')