From 633e962ac35f0cb0281bba4b22b88ff78cd76d80 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 8 Jul 2010 19:35:48 +0200
Subject: Make tunnel support optional in client too

---
 client/application.cpp |  4 ++++
 client/x11/Makefile.am | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'client')

diff --git a/client/application.cpp b/client/application.cpp
index 72db03f2..af37ae02 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -40,7 +40,9 @@
 #include "quic.h"
 #include "mutex.h"
 #include "cmd_line_parser.h"
+#ifdef USE_TUNNEL
 #include "tunnel_channel.h"
+#endif
 #include "rect.h"
 #ifdef USE_GUI
 #include "gui/gui.h"
@@ -1922,9 +1924,11 @@ void Application::register_channels()
         _client.register_channel_factory(RecordChannel::Factory());
     }
 
+#ifdef USE_TUNNEL
     if (_enabled_channels[SPICE_CHANNEL_TUNNEL]) {
         _client.register_channel_factory(TunnelChannel::Factory());
     }
+#endif
 }
 
 bool Application::process_cmd_line(int argc, char** argv)
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am
index dc83f58c..101f6ddf 100644
--- a/client/x11/Makefile.am
+++ b/client/x11/Makefile.am
@@ -109,8 +109,6 @@ RED_COMMON_SRCS =					\
 	$(CLIENT_DIR)/hot_keys.cpp			\
 	$(CLIENT_DIR)/hot_keys.h			\
 	$(CLIENT_DIR)/threads.cpp			\
-	$(CLIENT_DIR)/tunnel_channel.cpp		\
-	$(CLIENT_DIR)/tunnel_channel.h			\
 	$(CLIENT_DIR)/utils.cpp				\
 	$(CLIENT_DIR)/utils.h				\
 	$(CLIENT_DIR)/zlib_decoder.cpp			\
@@ -118,6 +116,15 @@ RED_COMMON_SRCS =					\
 	$(CLIENT_DIR)/icon.h				\
 	$(NULL)
 
+if SUPPORT_TUNNEL
+RED_TUNNEL_SRCS =					\
+	$(CLIENT_DIR)/tunnel_channel.cpp		\
+	$(CLIENT_DIR)/tunnel_channel.h			\
+	$(NULL)
+else
+RED_TUNNEL_SRCS =
+endif
+
 if SUPPORT_GUI
 RED_GUI_SRCS =						\
 	$(CLIENT_DIR)/gui/softrenderer.h		\
@@ -127,7 +134,8 @@ RED_GUI_SRCS =						\
 	$(CLIENT_DIR)/gui/resource_provider.h		\
 	$(CLIENT_DIR)/gui/resource_provider.cpp		\
 	$(CLIENT_DIR)/gui/gui.h				\
-	$(CLIENT_DIR)/gui/gui.cpp
+	$(CLIENT_DIR)/gui/gui.cpp			\
+	$(NULL)
 else
 RED_GUI_SRCS =
 endif
@@ -176,6 +184,7 @@ spicec_SOURCES =			\
 	x_platform.h			\
 	$(RED_COMMON_SRCS)		\
 	$(RED_GUI_SRCS)			\
+	$(RED_TUNNEL_SRCS)		\
 	$(RED_OGL_SRCS)			\
 	$(NULL)
 
-- 
cgit