GUACAMOLE-296: Add checks for Stream functions in winpr libraries.
diff --git a/configure.ac b/configure.ac
index 0acb27b..11e765b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -518,6 +518,7 @@
have_freerdp=disabled
RDP_LIBS=
+WINPR_LIBS=
AC_ARG_WITH([rdp],
[AS_HELP_STRING([--with-rdp],
[support RDP @<:@default=check@:>@])],
@@ -719,6 +720,21 @@
[#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
@@ -1027,6 +1043,7 @@
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp}" = "xyes"])
AC_SUBST(RDP_LIBS)
+AC_SUBST(WINPR_LIBS)
#
# libssh2
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 29a9674..c3f9444 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -155,7 +155,8 @@
-version-info 0:0:0 \
@CAIRO_LIBS@ \
@PTHREAD_LIBS@ \
- @RDP_LIBS@
+ @RDP_LIBS@ \
+ @WINPR_LIBS@
libguac_client_rdp_la_LIBADD = \
@COMMON_LTLIB@ \
@@ -174,7 +175,8 @@
guacdr_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
- @RDP_LIBS@
+ @RDP_LIBS@ \
+ @WINPR_LIBS@
guacdr_libadd = \
@COMMON_LTLIB@ \
@@ -193,7 +195,8 @@
guacai_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
- @RDP_LIBS@
+ @RDP_LIBS@ \
+ @WINPR_LIBS@
guacai_libadd = \
@COMMON_LTLIB@ \
@@ -212,7 +215,8 @@
guacsnd_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
- @RDP_LIBS@
+ @RDP_LIBS@ \
+ @WINPR_LIBS@
guacsnd_libadd = \
@COMMON_LTLIB@ \
@@ -231,7 +235,8 @@
guacsvc_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
- @RDP_LIBS@
+ @RDP_LIBS@ \
+ @WINPR_LIBS@
guacsvc_libadd = \
@COMMON_LTLIB@ \
