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

GUACAMOLE-249: Automatically determine correct location for FreeRDP plugins.

Browse Source
This commit is contained in:
Michael Jumper 2020-01-15 21:52:41 -08:00
parent 3e22526ad9
commit 37dceed8ec
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -546,7 +546,8 @@ 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"]
[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)
@ -664,6 +665,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"])
# #
@ -994,6 +996,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
# #
@ -1034,6 +1042,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.)