[gnome-terminal] utils: Avoid X dependency in the nautilus extension

[Christian Persch <chpe src gnome org>]

commit da76fafdef54985f121c4aca97b741963fc6e599
Author: Christian Persch <chpe gnome org>
Date:   Tue Apr 8 12:47:12 2014 +0200

    utils: Avoid X dependency in the nautilus extension
    
    https://bugzilla.gnome.org/show_bug.cgi?id=705659

 src/Makefile.am             |    1 -
 src/terminal-client-utils.c |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 8050f06..52d0824 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -259,7 +259,6 @@ nodist_libterminal_nautilus_la_SOURCES = \
        $(NULL)
 
 libterminal_nautilus_la_CPPFLAGS = \
-       -DTERMINAL_COMPILATION \
        -DTERM_LOCALEDIR="\"$(datadir)/locale\"" \
        $(AM_CPPFLAGS)
 
diff --git a/src/terminal-client-utils.c b/src/terminal-client-utils.c
index 1e8cf3b..a0756a2 100644
--- a/src/terminal-client-utils.c
+++ b/src/terminal-client-utils.c
@@ -29,7 +29,7 @@
 #include <gio/gio.h>
 
 #include <gdk/gdk.h>
-#ifdef GDK_WINDOWING_X11
+#if defined(TERMINAL_COMPILATION) && defined(GDK_WINDOWING_X11)
 #include <gdk/gdkx.h>
 #endif
 
@@ -137,7 +137,7 @@ terminal_client_append_exec_options (GVariantBuilder *builder,
 void 
 terminal_client_get_fallback_startup_id  (char **startup_id)
 {
-#ifdef GDK_WINDOWING_X11
+#if defined(TERMINAL_COMPILATION) && defined(GDK_WINDOWING_X11)
   GdkDisplay *display;
   Display *xdisplay;
   Window xwindow;