GUACAMOLE-296: Merge fix for linking issues with FreeRDP 1.1 and guacai (audio input).
This commit is contained in:
commit
95be88be19
@ -506,6 +506,7 @@ 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@:>@])],
|
||||||
@ -695,7 +696,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,,
|
AC_CHECK_HEADER(winpr/stream.h,[WINPR_LIBS="$WINPR_LIBS -lwinpr-utils"],
|
||||||
[have_winpr=no,
|
[have_winpr=no,
|
||||||
AC_CHECK_DECL([stream_write_uint8],,
|
AC_CHECK_DECL([stream_write_uint8],,
|
||||||
[AC_MSG_WARN([
|
[AC_MSG_WARN([
|
||||||
@ -1015,6 +1016,7 @@ 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
|
||||||
|
@ -185,7 +185,8 @@ 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@ \
|
||||||
|
Loading…
Reference in New Issue
Block a user