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

Detect extension format.

Browse Source
This commit is contained in:
Michael Jumper 2013-07-17 11:27:38 -07:00
parent 450017a6bd
commit df01ba66ea
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -215,6 +215,7 @@ fi
have_winpr=yes have_winpr=yes
have_freerdp=yes have_freerdp=yes
legacy_freerdp_extensions=no
RDP_LIBS= RDP_LIBS=
# libfreerdp-cache # libfreerdp-cache
@ -231,7 +232,8 @@ AC_CHECK_LIB([freerdp-core], [freerdp_new],
AC_CHECK_LIB([freerdp-client], [freerdp_channels_new], AC_CHECK_LIB([freerdp-client], [freerdp_channels_new],
[RDP_LIBS="$RDP_LIBS -lfreerdp-client"], [RDP_LIBS="$RDP_LIBS -lfreerdp-client"],
[AC_CHECK_LIB([freerdp-channels], [freerdp_channels_new], [AC_CHECK_LIB([freerdp-channels], [freerdp_channels_new],
[RDP_LIBS="$RDP_LIBS -lfreerdp-channels"], [RDP_LIBS="$RDP_LIBS -lfreerdp-channels"
legacy_freerdp_extensions=yes],
[have_freerdp=no])]) [have_freerdp=no])])
# libfreerdp-utils # libfreerdp-utils
@ -269,6 +271,7 @@ then
fi fi
AM_CONDITIONAL([LEGACY_FREERDP_EXTENSIONS], [test "x${legacy_freerdp_extensions}" = "xyes"])
AM_CONDITIONAL([ENABLE_WINPR], [test "x${have_winpr}" = "xyes"]) AM_CONDITIONAL([ENABLE_WINPR], [test "x${have_winpr}" = "xyes"])
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp}" = "xyes"]) AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp}" = "xyes"])

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

@ -40,7 +40,6 @@ ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -Werror -Wall -Iinclude @LIBGUAC_INCLUDE@ AM_CFLAGS = -Werror -Wall -Iinclude @LIBGUAC_INCLUDE@
lib_LTLIBRARIES = libguac-client-rdp.la lib_LTLIBRARIES = libguac-client-rdp.la
freerdp_LTLIBRARIES = guac_rdpsnd.la guac_rdpdr.la
libguac_client_rdp_la_SOURCES = \ libguac_client_rdp_la_SOURCES = \
audio.c \ audio.c \
@ -60,12 +59,12 @@ libguac_client_rdp_la_SOURCES = \
rdp_pointer.c \ rdp_pointer.c \
wav_encoder.c wav_encoder.c
guac_rdpsnd_la_SOURCES = \ guacsnd_sources = \
guac_rdpsnd/rdpsnd_messages.c \ guac_rdpsnd/rdpsnd_messages.c \
guac_rdpsnd/rdpsnd_service.c \ guac_rdpsnd/rdpsnd_service.c \
audio.c audio.c
guac_rdpdr_la_SOURCES = \ guacdr_sources = \
guac_rdpdr/rdpdr_messages.c \ guac_rdpdr/rdpdr_messages.c \
guac_rdpdr/rdpdr_printer.c \ guac_rdpdr/rdpdr_printer.c \
guac_rdpdr/rdpdr_service.c guac_rdpdr/rdpdr_service.c
@ -92,8 +91,8 @@ noinst_HEADERS = \
# 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 noinst_HEADERS += compat/winpr-stream.h
guac_rdpsnd_la_SOURCES += compat/winpr-stream.c guacsnd_sources += compat/winpr-stream.c
guac_rdpdr_la_SOURCES += compat/winpr-stream.c guacdr_sources += compat/winpr-stream.c
endif endif
# Compile OGG support if available # Compile OGG support if available
@ -103,12 +102,40 @@ if ENABLE_OGG
endif endif
libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0 @RDP_LIBS@ @VORBIS_LIBS@ @PTHREAD_LIBS@ @CAIRO_LIBS@ libguac_client_rdp_la_LDFLAGS = -version-info 0:0:0 @RDP_LIBS@ @VORBIS_LIBS@ @PTHREAD_LIBS@ @CAIRO_LIBS@
guac_rdpsnd_la_LDFLAGS = -module -avoid-version -shared @RDP_LIBS@ @VORBIS_LIBS@ @PTHREAD_LIBS@ guacsnd_ldflags = -module -avoid-version -shared @RDP_LIBS@ @VORBIS_LIBS@ @PTHREAD_LIBS@
guac_rdpdr_la_LDFLAGS = -module -avoid-version -shared @RDP_LIBS@ @PTHREAD_LIBS@ guacdr_ldflags = -module -avoid-version -shared @RDP_LIBS@ @PTHREAD_LIBS@
libguac_client_rdp_la_LIBADD = @LIBGUAC_LTLIB@ libguac_client_rdp_la_LIBADD = @LIBGUAC_LTLIB@
guac_rdpsnd_la_LIBADD = @LIBGUAC_LTLIB@ guacsnd_libadd = @LIBGUAC_LTLIB@
guac_rdpdr_la_LIBADD = @LIBGUAC_LTLIB@ guacdr_libadd = @LIBGUAC_LTLIB@
if LEGACY_FREERDP_EXTENSIONS
# FreeRDP 1.0-style extensions
freerdp_LTLIBRARIES = guacsnd.la guacdr.la
freerdpdir = ${libdir}/freerdp freerdpdir = ${libdir}/freerdp
guacsnd_la_SOURCES = ${guacsnd_sources}
guacsnd_la_LDFLAGS = ${guacsnd_ldflags}
guacsnd_la_LIBADD = ${guacsnd_libadd}
guacdr_la_SOURCES = ${guacdr_sources}
guacdr_la_LDFLAGS = ${guacdr_ldflags}
guacdr_la_LIBADD = ${guacdr_libadd}
else
# FreeRDP 1.1 (and hopefully onward) extensions
freerdp_LTLIBRARIES = guacsnd-client.la guacdr-client.la
freerdpdir = ${libdir}/freerdp/extensions
guacsnd_client_la_SOURCES = ${guacsnd_sources}
guacsnd_client_la_LDFLAGS = ${guacsnd_ldflags}
guacsnd_client_la_LIBADD = ${guacsnd_libadd}
guacdr_client_la_SOURCES = ${guacdr_sources}
guacdr_client_la_LDFLAGS = ${guacdr_ldflags}
guacdr_client_la_LIBADD = ${guacdr_libadd}
endif