GUACAMOLE-296: Merge changes linking libwinpr / libwinpr-utils as needed.

This commit is contained in:
Mike Jumper 2019-04-24 15:35:16 -07:00 committed by GitHub
commit 5e8f5eaa50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 5 deletions

View File

@ -560,6 +560,7 @@ fi
have_freerdp=disabled
RDP_LIBS=
WINPR_LIBS=
AC_ARG_WITH([rdp],
[AS_HELP_STRING([--with-rdp],
[support RDP @<:@default=check@:>@])],
@ -761,6 +762,21 @@ then
[#include <freerdp/utils/stream.h>])])
fi
# Find location of Stream_New and Stream_free
if test "x${have_freerdp}" = "xyes" -a "x${have_winpr}" = "xyes"
then
AC_CHECK_LIB([winpr], [Stream_New, Stream_Free],
[WINPR_LIBS="$WINPR_LIBS -lwinpr"],
[AC_CHECK_LIB([winpr-utils], [Stream_New, Stream_Free],
[WINPR_LIBS="$WINPR_LIBS -lwinpr-utils"],
[AC_MSG_WARN([
------------------------------------------
Unable to locate stream functions in winpr
libraries. RDP will be disabled.
------------------------------------------])
have_freerdp=no])])
fi
# Check for types in WinPR
if test "x${have_freerdp}" = "xyes"
then
@ -1069,6 +1085,7 @@ AM_CONDITIONAL([ENABLE_WINPR], [test "x${have_winpr}" = "xyes"])
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp}" = "xyes"])
AC_SUBST(RDP_LIBS)
AC_SUBST(WINPR_LIBS)
#
# libssh2

View File

@ -156,7 +156,8 @@ libguac_client_rdp_la_LDFLAGS = \
-version-info 0:0:0 \
@CAIRO_LIBS@ \
@PTHREAD_LIBS@ \
@RDP_LIBS@
@RDP_LIBS@ \
@WINPR_LIBS@
libguac_client_rdp_la_LIBADD = \
@COMMON_LTLIB@ \
@ -175,7 +176,8 @@ guacdr_cflags = \
guacdr_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
@RDP_LIBS@
@RDP_LIBS@ \
@WINPR_LIBS@
guacdr_libadd = \
@COMMON_LTLIB@ \
@ -194,7 +196,8 @@ guacai_cflags = \
guacai_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
@RDP_LIBS@
@RDP_LIBS@ \
@WINPR_LIBS@
guacai_libadd = \
@COMMON_LTLIB@ \
@ -213,7 +216,8 @@ guacsnd_cflags = \
guacsnd_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
@RDP_LIBS@
@RDP_LIBS@ \
@WINPR_LIBS@
guacsnd_libadd = \
@COMMON_LTLIB@ \
@ -232,7 +236,8 @@ guacsvc_cflags = \
guacsvc_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
@RDP_LIBS@
@RDP_LIBS@ \
@WINPR_LIBS@
guacsvc_libadd = \
@COMMON_LTLIB@ \