From 560e96aa57dc746adcbd5297c3544edd16c0626e Mon Sep 17 00:00:00 2001
From: Scott Anderson <scott@anderso.nz>
Date: Wed, 22 Aug 2018 20:41:25 +1200
Subject: [PATCH] Update rootston to use new option

---
 meson.build          | 6 ++----
 meson_options.txt    | 1 -
 rootston/meson.build | 7 +++++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index ff1a4ee82..004cab4a9 100644
--- a/meson.build
+++ b/meson.build
@@ -161,14 +161,12 @@ summary = [
 message('\n'.join(summary))
 
 
-if get_option('enable-rootston')
-	subdir('rootston')
-endif
-
 if get_option('enable-examples')
 	subdir('examples')
 endif
 
+subdir('rootston')
+
 pkgconfig = import('pkgconfig')
 pkgconfig.generate(
 	libraries: lib_wlr,
diff --git a/meson_options.txt b/meson_options.txt
index 854022e7e..140459cb6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,3 @@
-option('enable-rootston', type: 'boolean', value: true, description: 'Build the rootston example compositor')
 option('enable-examples', type: 'boolean', value: true, description: 'Build example applications')
 option('libcap', type: 'feature', value: 'auto', description: 'Enable support for rootless session via capabilities (cap_sys_admin)')
 option('logind', type: 'feature', value: 'auto', description: 'Enable support for rootless session via logind')
diff --git a/rootston/meson.build b/rootston/meson.build
index b461e1a00..9d1decce0 100644
--- a/rootston/meson.build
+++ b/rootston/meson.build
@@ -11,8 +11,8 @@ sources = [
 	'seat.c',
 	'virtual_keyboard.c',
 	'wl_shell.c',
-	'xdg_shell_v6.c',
 	'xdg_shell.c',
+	'xdg_shell_v6.c',
 ]
 
 if conf_data.get('WLR_HAS_XWAYLAND', false)
@@ -20,5 +20,8 @@ if conf_data.get('WLR_HAS_XWAYLAND', false)
 endif
 
 executable(
-	'rootston', sources, dependencies: [wlroots, wlr_protos, pixman]
+	'rootston',
+	sources,
+	dependencies: [wlroots, wlr_protos, pixman],
+	build_by_default: get_option('rootston'),
 )