meson: Deprecate waltham and inform users of that

Waltham isn't really used, this is a step forward removing
support for it. For now just add an configuration option if users still
want to use it.

Bug-AGL: SPEC-4670
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I5ec900ef075717b438ef9e41167ad4833b2a8b87

diff --git a/meson.build b/meson.build
index cab7574..bdec8fd 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -239,7 +239,9 @@ if deps_remoting.length() == depnames.length()
   message('Found remoting depends, enabling remoting')
 endif
 
-if deps_waltham.length() == depnames_waltham.length() + depnames.length()
+if deps_waltham.length() == depnames_waltham.length() + depnames.length() and not get_option('waltham')
+  message('Found waltham depends, but waltham is deprecated')
+elif deps_waltham.length() == depnames_waltham.length() + depnames.length() and get_option('waltham')
   config_h.set('HAVE_WALTHAM', 1)
   message('Found waltham depends, enabling waltham')
 endif

diff --git a/meson_options.txt b/meson_options.txt
index 1e54773..e4d8f3d 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,3 +12,10 @@ option(
         value: true,
         description: 'Build gRPC proxy which exposes some of the agl-shell protocol over a gRPC API'
 )
+
+option(
+        'waltham',
+        type: 'boolean',
+        value: false,
+        description: 'Build compositor with Waltham support. Disabled by default'
+)