From b770800edabe9736a114d9c2c436d7b99d3b4399 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Fri, 10 Jul 2015 22:26:37 -0700
Subject: [PATCH] GUAC-1171: Only include common SSH library if enabled.

---
 src/protocols/rdp/Makefile.am | 17 ++++++++++-------
 src/protocols/vnc/Makefile.am | 14 +++++++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 1dffd4c2..acd23dc6 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -97,12 +97,6 @@ noinst_HEADERS =                             \
     resolution.h                             \
     unicode.h
 
-# Build SFTP support if enabled
-if ENABLE_COMMON_SSH
-noinst_HEADERS  += sftp.h
-libguac_client_rdp_la_SOURCES += sftp.c
-endif
-
 # Add compatibility layer for WinPR if not available
 if ! ENABLE_WINPR
 noinst_HEADERS  += compat/winpr-stream.h compat/winpr-wtypes.h
@@ -136,7 +130,6 @@ libguac_client_rdp_la_LDFLAGS = \
 
 libguac_client_rdp_la_LIBADD =     \
     @COMMON_LTLIB@                 \
-    @COMMON_SSH_LTLIB@             \
     @LIBGUAC_LTLIB@
 
 #
@@ -196,6 +189,16 @@ guacsvc_libadd =    \
     @COMMON_LTLIB@  \
     @LIBGUAC_LTLIB@
 
+#
+# Optional SFTP support
+#
+
+if ENABLE_COMMON_SSH
+libguac_client_rdp_la_SOURCES += sftp.c
+noinst_HEADERS                += sftp.h
+libguac_client_rdp_la_LIBADD  += @COMMON_SSH_LTLIB@
+endif
+
 #
 # Autogenerate keymaps
 #
diff --git a/src/protocols/vnc/Makefile.am b/src/protocols/vnc/Makefile.am
index db5a909d..86db0a75 100644
--- a/src/protocols/vnc/Makefile.am
+++ b/src/protocols/vnc/Makefile.am
@@ -37,12 +37,6 @@ noinst_HEADERS =      \
     guac_handlers.h   \
     vnc_handlers.h    
 
-# Optional SFTP support
-if ENABLE_COMMON_SSH
-libguac_client_vnc_la_SOURCES += sftp.c
-noinst_HEADERS  += sftp.h
-endif
-
 # Optional PulseAudio support
 if ENABLE_PULSE
 libguac_client_vnc_la_SOURCES += pulse.c
@@ -63,6 +57,12 @@ libguac_client_vnc_la_LDFLAGS = \
 
 libguac_client_vnc_la_LIBADD = \
     @COMMON_LTLIB@             \
-    @COMMON_SSH_LTLIB@         \
     @LIBGUAC_LTLIB@
 
+# Optional SFTP support
+if ENABLE_COMMON_SSH
+libguac_client_vnc_la_SOURCES += sftp.c
+noinst_HEADERS                += sftp.h
+libguac_client_vnc_la_LIBADD  += @COMMON_SSH_LTLIB@
+endif
+