From be5cdf52c1ca143ca9f13ee24e21201e47d6860b Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 16 Jan 2020 11:57:14 -0800 Subject: [PATCH] GUACAMOLE-249: Allow detected FreeRDP plugin directory to be overridden with --with-freerdp-plugin-dir. --- configure.ac | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5eb0c0a0..24c15884 100644 --- a/configure.ac +++ b/configure.ac @@ -532,12 +532,20 @@ fi # have_freerdp2=disabled +FREERDP2_PLUGIN_DIR= + AC_ARG_WITH([rdp], [AS_HELP_STRING([--with-rdp], [support RDP @<:@default=check@:>@])], [], [with_rdp=check]) +# FreeRDP plugin directory +AC_ARG_WITH(freerdp_plugin_dir, + [AS_HELP_STRING([--with-freerdp-plugin-dir=], + [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 # options specific to FreeRDP tests OLDCPPFLAGS="$CPPFLAGS" @@ -547,7 +555,8 @@ then have_freerdp2=yes PKG_CHECK_MODULES([RDP], [freerdp2 freerdp-client2 winpr2], [CPPFLAGS="${RDP_CFLAGS} -Werror $CPPFLAGS"] - [FREERDP2_PLUGIN_DIR="`$PKG_CONFIG --variable=libdir freerdp2`/freerdp2"], + [AS_IF([test "x${FREERDP2_PLUGIN_DIR}" = "x"], + [FREERDP2_PLUGIN_DIR="`$PKG_CONFIG --variable=libdir freerdp2`/freerdp2"])], [AC_MSG_WARN([ -------------------------------------------- Unable to find FreeRDP (libfreerdp2 / libfreerdp-client2 / libwinpr2)