GUACAMOLE-296: Add checks for Stream functions in winpr libraries.
This commit is contained in:
parent
5e2ddb890a
commit
1b8e31b70c
17
configure.ac
17
configure.ac
@ -518,6 +518,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@:>@])],
|
||||||
@ -719,6 +720,21 @@ then
|
|||||||
[#include <freerdp/utils/stream.h>])])
|
[#include <freerdp/utils/stream.h>])])
|
||||||
fi
|
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
|
# Check for types in WinPR
|
||||||
if test "x${have_freerdp}" = "xyes"
|
if test "x${have_freerdp}" = "xyes"
|
||||||
then
|
then
|
||||||
@ -1027,6 +1043,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
|
||||||
|
@ -155,7 +155,8 @@ libguac_client_rdp_la_LDFLAGS = \
|
|||||||
-version-info 0:0:0 \
|
-version-info 0:0:0 \
|
||||||
@CAIRO_LIBS@ \
|
@CAIRO_LIBS@ \
|
||||||
@PTHREAD_LIBS@ \
|
@PTHREAD_LIBS@ \
|
||||||
@RDP_LIBS@
|
@RDP_LIBS@ \
|
||||||
|
@WINPR_LIBS@
|
||||||
|
|
||||||
libguac_client_rdp_la_LIBADD = \
|
libguac_client_rdp_la_LIBADD = \
|
||||||
@COMMON_LTLIB@ \
|
@COMMON_LTLIB@ \
|
||||||
@ -174,7 +175,8 @@ guacdr_cflags = \
|
|||||||
guacdr_ldflags = \
|
guacdr_ldflags = \
|
||||||
-module -avoid-version -shared \
|
-module -avoid-version -shared \
|
||||||
@PTHREAD_LIBS@ \
|
@PTHREAD_LIBS@ \
|
||||||
@RDP_LIBS@
|
@RDP_LIBS@ \
|
||||||
|
@WINPR_LIBS@
|
||||||
|
|
||||||
guacdr_libadd = \
|
guacdr_libadd = \
|
||||||
@COMMON_LTLIB@ \
|
@COMMON_LTLIB@ \
|
||||||
@ -193,7 +195,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@ \
|
||||||
@ -212,7 +215,8 @@ guacsnd_cflags = \
|
|||||||
guacsnd_ldflags = \
|
guacsnd_ldflags = \
|
||||||
-module -avoid-version -shared \
|
-module -avoid-version -shared \
|
||||||
@PTHREAD_LIBS@ \
|
@PTHREAD_LIBS@ \
|
||||||
@RDP_LIBS@
|
@RDP_LIBS@ \
|
||||||
|
@WINPR_LIBS@
|
||||||
|
|
||||||
guacsnd_libadd = \
|
guacsnd_libadd = \
|
||||||
@COMMON_LTLIB@ \
|
@COMMON_LTLIB@ \
|
||||||
@ -231,7 +235,8 @@ guacsvc_cflags = \
|
|||||||
guacsvc_ldflags = \
|
guacsvc_ldflags = \
|
||||||
-module -avoid-version -shared \
|
-module -avoid-version -shared \
|
||||||
@PTHREAD_LIBS@ \
|
@PTHREAD_LIBS@ \
|
||||||
@RDP_LIBS@
|
@RDP_LIBS@ \
|
||||||
|
@WINPR_LIBS@
|
||||||
|
|
||||||
guacsvc_libadd = \
|
guacsvc_libadd = \
|
||||||
@COMMON_LTLIB@ \
|
@COMMON_LTLIB@ \
|
||||||
|
Loading…
Reference in New Issue
Block a user