[sushi/wip/lantw/build-fix-build-when-wayland-is-disabled] build: fix build when wayland is disabled

[Ting-Wei Lan <lantw src gnome org>]

commit 9cbf8aca080b03526739e84fd9671e5e358d5d95
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sat Sep 28 16:16:10 2019 +0800

    build: fix build when wayland is disabled
    
    HAVE_GTK_X11 and HAVE_GTK_WAYLAND are defined with set10, so we should use #if
    instead of #ifdef because it is always defined.

 src/libsushi/externalwindow.c |  8 ++++----
 src/libsushi/meson.build      | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)
---
diff --git a/src/libsushi/externalwindow.c b/src/libsushi/externalwindow.c
index 9b81670..10f4874 100644
--- a/src/libsushi/externalwindow.c
+++ b/src/libsushi/externalwindow.c
@@ -23,10 +23,10 @@
 #include <string.h>
 
 #include "externalwindow.h"
-#ifdef HAVE_GTK_X11
+#if HAVE_GTK_X11
 #include "externalwindow-x11.h"
 #endif
-#ifdef HAVE_GTK_WAYLAND
+#if HAVE_GTK_WAYLAND
 #include "externalwindow-wayland.h"
 #endif
 
@@ -47,7 +47,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (ExternalWindow, external_window, G_TYPE_OBJECT)
 ExternalWindow *
 create_external_window_from_handle (const char *handle_str)
 {
-#ifdef HAVE_GTK_X11
+#if HAVE_GTK_X11
     {
       const char x11_prefix[] = "x11:";
       if (g_str_has_prefix (handle_str, x11_prefix))
@@ -60,7 +60,7 @@ create_external_window_from_handle (const char *handle_str)
         }
     }
 #endif
-#ifdef HAVE_GTK_WAYLAND
+#if HAVE_GTK_WAYLAND
     {
       const char wayland_prefix[] = "wayland:";
       if (g_str_has_prefix (handle_str, wayland_prefix))
diff --git a/src/libsushi/meson.build b/src/libsushi/meson.build
index 4f15335..95657df 100644
--- a/src/libsushi/meson.build
+++ b/src/libsushi/meson.build
@@ -6,12 +6,22 @@ configure_file(output: 'config.h', configuration: config_data)
 externalwindow_sources = [
   'externalwindow.c',
   'externalwindow.h',
-  'externalwindow-wayland.c',
-  'externalwindow-wayland.h',
-  'externalwindow-x11.c',
-  'externalwindow-x11.h',
 ]
 
+if gtk_x11_dep.found()
+  externalwindow_sources += [
+    'externalwindow-x11.c',
+    'externalwindow-x11.h',
+  ]
+endif
+
+if gtk_wayland_dep.found()
+  externalwindow_sources += [
+    'externalwindow-wayland.c',
+    'externalwindow-wayland.h',
+  ]
+endif
+
 libsushi_deps = [
   epoxy_dep,
   evince_document_dep,