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

GUACAMOLE-296: Merge changes reverting explicit linking of libwinpr-utils.

Browse Source
This commit is contained in:
Michael Jumper 2017-11-06 11:24:39 -08:00
commit 233f5e27e2
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -506,7 +506,6 @@ fi
have_freerdp=disabled have_freerdp=disabled
RDP_LIBS= RDP_LIBS=
WINPR_LIBS=
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@:>@])],
@ -696,7 +695,7 @@ fi
# Check for stream support via WinPR # Check for stream support via WinPR
if test "x${have_freerdp}" = "xyes" if test "x${have_freerdp}" = "xyes"
then then
AC_CHECK_HEADER(winpr/stream.h,[WINPR_LIBS="$WINPR_LIBS -lwinpr-utils"], AC_CHECK_HEADER(winpr/stream.h,,
[have_winpr=no, [have_winpr=no,
AC_CHECK_DECL([stream_write_uint8],, AC_CHECK_DECL([stream_write_uint8],,
[AC_MSG_WARN([ [AC_MSG_WARN([
@ -1016,7 +1015,6 @@ 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"])
AC_SUBST(RDP_LIBS) AC_SUBST(RDP_LIBS)
AC_SUBST(WINPR_LIBS)
# #
# libssh2 # libssh2

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

@ -185,8 +185,7 @@ guacai_cflags = \
guacai_ldflags = \ guacai_ldflags = \
-module -avoid-version -shared \ -module -avoid-version -shared \
@PTHREAD_LIBS@ \ @PTHREAD_LIBS@ \
@RDP_LIBS@ \ @RDP_LIBS@
@WINPR_LIBS@
guacai_libadd = \ guacai_libadd = \
@COMMON_LTLIB@ \ @COMMON_LTLIB@ \