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

Merge staging/1.1.0 changes back to master.

Browse Source
This commit is contained in:
Nick Couchman 2020-01-16 15:06:56 -05:00
commit fd2c5b9259
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -559,12 +559,20 @@ fi
# #
have_freerdp2=disabled have_freerdp2=disabled
FREERDP2_PLUGIN_DIR=
AC_ARG_WITH([rdp], AC_ARG_WITH([rdp],
[AS_HELP_STRING([--with-rdp], [AS_HELP_STRING([--with-rdp],
[support RDP @<:@default=check@:>@])], [support RDP @<:@default=check@:>@])],
[], [],
[with_rdp=check]) [with_rdp=check])
# FreeRDP plugin directory
AC_ARG_WITH(freerdp_plugin_dir,
[AS_HELP_STRING([--with-freerdp-plugin-dir=<path>],
[install FreeRDP plugins to the given directory @<:@default=check@:>@])
],FREERDP2_PLUGIN_DIR=$withval)
# Preserve CPPFLAGS so it can be restored later, following the addition of # Preserve CPPFLAGS so it can be restored later, following the addition of
# options specific to FreeRDP tests # options specific to FreeRDP tests
OLDCPPFLAGS="$CPPFLAGS" OLDCPPFLAGS="$CPPFLAGS"
@ -573,7 +581,9 @@ if test "x$with_rdp" != "xno"
then then
have_freerdp2=yes have_freerdp2=yes
PKG_CHECK_MODULES([RDP], [freerdp2 freerdp-client2 winpr2], PKG_CHECK_MODULES([RDP], [freerdp2 freerdp-client2 winpr2],
[CPPFLAGS="${RDP_CFLAGS} -Werror $CPPFLAGS"], [CPPFLAGS="${RDP_CFLAGS} -Werror $CPPFLAGS"]
[AS_IF([test "x${FREERDP2_PLUGIN_DIR}" = "x"],
[FREERDP2_PLUGIN_DIR="`$PKG_CONFIG --variable=libdir freerdp2`/freerdp2"])],
[AC_MSG_WARN([ [AC_MSG_WARN([
-------------------------------------------- --------------------------------------------
Unable to find FreeRDP (libfreerdp2 / libfreerdp-client2 / libwinpr2) Unable to find FreeRDP (libfreerdp2 / libfreerdp-client2 / libwinpr2)
@ -691,6 +701,7 @@ fi
# Restore CPPFLAGS, removing FreeRDP-specific options needed for testing # Restore CPPFLAGS, removing FreeRDP-specific options needed for testing
CPPFLAGS="$OLDCPPFLAGS" CPPFLAGS="$OLDCPPFLAGS"
AC_SUBST(FREERDP2_PLUGIN_DIR)
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp2}" = "xyes"]) AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp2}" = "xyes"])
# #
@ -1021,6 +1032,12 @@ AM_COND_IF([ENABLE_INIT], [build_init="${init_dir}"], [build_init=no])
AM_COND_IF([ENABLE_SYSTEMD], [build_systemd="${systemd_dir}"], [build_systemd=no]) AM_COND_IF([ENABLE_SYSTEMD], [build_systemd="${systemd_dir}"], [build_systemd=no])
#
# FreeRDP plugins
#
AM_COND_IF([ENABLE_RDP], [build_rdp_plugins="${FREERDP2_PLUGIN_DIR}"], [build_rdp_plugins=no])
# #
# Display summary # Display summary
# #
@ -1061,6 +1078,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
guacenc .... ${build_guacenc} guacenc .... ${build_guacenc}
guaclog .... ${build_guaclog} guaclog .... ${build_guaclog}
FreeRDP plugins: ${build_rdp_plugins}
Init scripts: ${build_init} Init scripts: ${build_init}
Systemd units: ${build_systemd} Systemd units: ${build_systemd}

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

@ -150,7 +150,7 @@ freerdp_LTLIBRARIES = \
libguac-common-svc-client.la \ libguac-common-svc-client.la \
libguacai-client.la libguacai-client.la
freerdpdir = ${libdir}/freerdp2 freerdpdir = @FREERDP2_PLUGIN_DIR@
# #
# Common SVC plugin (shared by RDPDR, RDPSND, etc.) # Common SVC plugin (shared by RDPDR, RDPSND, etc.)