X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meson.build;h=4d846d29cebd28edf22d4b45556a29a1de03e8e1;hb=refs%2Fchanges%2F12%2F29012%2F1;hp=cab7574780dbdabaca47eee11200337e007c0aa4;hpb=6fd11a88c4d3c82e33b6086d4783ce172e1a2695;p=src%2Fagl-compositor.git

diff --git a/meson.build b/meson.build
index cab7574..4d846d2 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
@@ -64,25 +63,6 @@ foreach depname : depnames
 endforeach
 
 
-# the transmitter plug-in requires waltham but we don't have a cflags or libs
-# for it so we add waltham depends here. Further more, the output is being
-# handled by remoting plug-in
-depnames_waltham = [
-  'waltham', 'waltham-transmitter',
-]
-
-deps_waltham = []
-foreach depname : depnames_waltham
-  dep = dependency(depname, required: false)
-  if dep.found()
-    deps_waltham += dep
-  else
-    message('Waltham requires @0@ which was not found. '.format(depname))
-  endif
-endforeach
-
-deps_waltham += deps_remoting
-
 agl_shell_xml = files('protocol/agl-shell.xml')
 agl_shell_desktop_xml = files('protocol/agl-shell-desktop.xml')
 agl_screenshooter = files('protocol/agl-screenshooter.xml')
@@ -133,21 +113,7 @@ foreach proto: protocols
     endforeach
 endforeach
 
-# libweston pkg-config file already has 'libweston' as prefix but
-# agl-compositor uses 'libweston' also. This makes use of the prefix path as to
-# allow building and installing the compositor locally
 prefix_path = get_option('prefix')
-message('prefix_path ' + prefix_path)
-if not prefix_path.contains('/usr')
-  include_dir_str = join_paths(prefix_path, 'include')
-  if not fs.is_dir(include_dir_str)
-    error('Prefix path does not contain an include directory!')
-  endif
-  local_dep = declare_dependency(include_directories: include_dir_str)
-else
-  local_dep = []
-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')
@@ -155,9 +121,9 @@ libweston_dep = dependency(libweston_version)
 
 deps_libweston = [
   dependency('wayland-server'),
+  dependency('weston'),
   libweston_dep,
   dependency('libweston-desktop-10'),
-  local_dep,
 ]
 
 
@@ -239,16 +205,6 @@ if deps_remoting.length() == depnames.length()
   message('Found remoting depends, enabling remoting')
 endif
 
-if deps_waltham.length() == depnames_waltham.length() + depnames.length()
-  config_h.set('HAVE_WALTHAM', 1)
-  message('Found waltham depends, enabling waltham')
-endif
-
-if dep_libsmack.found()
-  config_h.set('HAVE_SMACK', 1)
-  deps_libweston += dep_libsmack
-endif
-
 dir_module_agl_compositor = join_paths(join_paths(prefix_path, get_option('libdir')), 'agl-compositor')
 
 libexec_compositor = shared_library(