From 3aa126a90ddfbaad1db6b1de6e3bd8ba986c62dd Mon Sep 17 00:00:00 2001
From: Marcel Hollerbach <marcel-hollerbach@t-online.de>
Date: Fri, 11 Aug 2017 19:29:36 +0200
Subject: [PATCH] meson: build again without wayland

---
 src/modules/wl_desktop_shell/meson.build | 36 +++++++++++---------
 src/modules/wl_text_input/meson.build    | 28 +++++++++------
 src/modules/wl_weekeyboard/meson.build   | 43 +++++++++++++-----------
 3 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/src/modules/wl_desktop_shell/meson.build b/src/modules/wl_desktop_shell/meson.build
index 88cb7175e..dec319e3d 100644
--- a/src/modules/wl_desktop_shell/meson.build
+++ b/src/modules/wl_desktop_shell/meson.build
@@ -1,16 +1,20 @@
-src = files(
-  'e_mod_main.c',
-  'e_mod_input_panel.c',
-  'wl_shell.c',
-  'xdg5.c',
-  'xdg6.c',
-  'e_mod_main.h'
-)
-foreach p: [
-  '@0@/unstable/xdg-shell/xdg-shell-unstable-v5.xml'.format(dir_wayland_protocols),
-  '@0@/unstable/xdg-shell/xdg-shell-unstable-v6.xml'.format(dir_wayland_protocols),
-  '@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
-]
-  src += gen_scanner_server.process(p)
-  src += gen_scanner_impl.process(p)
-endforeach
+if get_option('wayland') != true
+  disable = true
+else
+  src = files(
+    'e_mod_main.c',
+    'e_mod_input_panel.c',
+    'wl_shell.c',
+    'xdg5.c',
+    'xdg6.c',
+    'e_mod_main.h'
+  )
+  foreach p: [
+    '@0@/unstable/xdg-shell/xdg-shell-unstable-v5.xml'.format(dir_wayland_protocols),
+    '@0@/unstable/xdg-shell/xdg-shell-unstable-v6.xml'.format(dir_wayland_protocols),
+    '@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
+  ]
+    src += gen_scanner_server.process(p)
+    src += gen_scanner_impl.process(p)
+  endforeach
+endif
diff --git a/src/modules/wl_text_input/meson.build b/src/modules/wl_text_input/meson.build
index 3ee2ecf16..c349e114c 100644
--- a/src/modules/wl_text_input/meson.build
+++ b/src/modules/wl_text_input/meson.build
@@ -1,13 +1,19 @@
-src = files(
-  'e_mod_main.c'
-)
+if get_option('wayland') != true
+  disable = true
+else
+  config_h.set('HAVE_WL_DRM', '1')
 
-foreach p: [
-  '@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
-  '@0@/unstable/text-input/text-input-unstable-v1.xml'.format(dir_wayland_protocols)
-]
-  src += gen_scanner_server.process(p)
-  src += gen_scanner_impl.process(p)
-endforeach
+  src = files(
+    'e_mod_main.c'
+  )
 
-no_icon = true
+  foreach p: [
+    '@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
+    '@0@/unstable/text-input/text-input-unstable-v1.xml'.format(dir_wayland_protocols)
+  ]
+    src += gen_scanner_server.process(p)
+    src += gen_scanner_impl.process(p)
+  endforeach
+
+  no_icon = true
+endif
diff --git a/src/modules/wl_weekeyboard/meson.build b/src/modules/wl_weekeyboard/meson.build
index 3fe5d7b71..6475b8ef6 100644
--- a/src/modules/wl_weekeyboard/meson.build
+++ b/src/modules/wl_weekeyboard/meson.build
@@ -1,22 +1,27 @@
-src = files(
-  'e_mod_main.c',
-  'wkb-log.c',
-  'wkb-log.h'
-)
+if get_option('wayland') != true
+  disable = true
+else
+  config_h.set('HAVE_WL_DRM', '1')
+  src = files(
+    'e_mod_main.c',
+    'wkb-log.c',
+    'wkb-log.h'
+  )
 
-foreach p: [
-  '@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
-  '@0@/unstable/text-input/text-input-unstable-v1.xml'.format(dir_wayland_protocols),
-]
-  src += gen_scanner_server.process(p)
-  src += gen_scanner_client.process(p)
-  src += gen_scanner_impl.process(p)
-endforeach
+  foreach p: [
+    '@0@/unstable/input-method/input-method-unstable-v1.xml'.format(dir_wayland_protocols),
+    '@0@/unstable/text-input/text-input-unstable-v1.xml'.format(dir_wayland_protocols),
+  ]
+    src += gen_scanner_server.process(p)
+    src += gen_scanner_client.process(p)
+    src += gen_scanner_impl.process(p)
+  endforeach
 
-data = [
-  'themes/default/default_600.edj',
-  'themes/default/default_720.edj',
-  'themes/default/default_1080.edj'
-]
+  data = [
+    'themes/default/default_600.edj',
+    'themes/default/default_720.edj',
+    'themes/default/default_1080.edj'
+  ]
 
-no_icon = true
+  no_icon = true
+endif