maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-1171: Only include common SSH library if enabled.

Browse Source
This commit is contained in:
Michael Jumper 2015-07-10 22:26:37 -07:00
parent 2e5a3606f3
commit b770800eda
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/protocols/rdp/Makefile.am
View File

@ -97,12 +97,6 @@ noinst_HEADERS = \
resolution.h \ resolution.h \
unicode.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 # Add compatibility layer for WinPR if not available
if ! ENABLE_WINPR if ! ENABLE_WINPR
noinst_HEADERS += compat/winpr-stream.h compat/winpr-wtypes.h noinst_HEADERS += compat/winpr-stream.h compat/winpr-wtypes.h
@ -136,7 +130,6 @@ libguac_client_rdp_la_LDFLAGS = \
libguac_client_rdp_la_LIBADD = \ libguac_client_rdp_la_LIBADD = \
@COMMON_LTLIB@ \ @COMMON_LTLIB@ \
@COMMON_SSH_LTLIB@ \
@LIBGUAC_LTLIB@ @LIBGUAC_LTLIB@
# #
@ -196,6 +189,16 @@ guacsvc_libadd = \
@COMMON_LTLIB@ \ @COMMON_LTLIB@ \
@LIBGUAC_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 # Autogenerate keymaps
# #

14
src/protocols/vnc/Makefile.am
View File

@ -37,12 +37,6 @@ noinst_HEADERS = \
guac_handlers.h \ guac_handlers.h \
vnc_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 # Optional PulseAudio support
if ENABLE_PULSE if ENABLE_PULSE
libguac_client_vnc_la_SOURCES += pulse.c libguac_client_vnc_la_SOURCES += pulse.c
@ -63,6 +57,12 @@ libguac_client_vnc_la_LDFLAGS = \
libguac_client_vnc_la_LIBADD = \ libguac_client_vnc_la_LIBADD = \
@COMMON_LTLIB@ \ @COMMON_LTLIB@ \
@COMMON_SSH_LTLIB@ \
@LIBGUAC_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