summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorFORT David <rdp.effort@gmail.com>2016-05-01 23:32:07 +0200
committerBryce Harrington <bryce@osg.samsung.com>2016-05-19 14:48:17 -0700
commit58b63ab7f1eec70c421b42a509f13dbc08a558ad (patch)
treeeea94bcd88e19597869620349ea5d3d7b19d8374 /configure.ac
parent0887956e4d2ea747db97ce7943d3e0ff79f89cd9 (diff)
downloadweston-58b63ab7f1eec70c421b42a509f13dbc08a558ad.tar.gz
rdp: allow to compile against FreeRDP 2.0
FreeRDP 2.0 is about to be released, this allows to compile against this version. The detection is adjusted to prefer FreeRDP 2 against version 1.x. Signed-off-by: David Fort <contact@hardening-consulting.com> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index c49c632a..e1300b45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,7 +238,10 @@ AM_CONDITIONAL([ENABLE_RDP_COMPOSITOR],
[test x$enable_rdp_compositor = xyes])
if test x$enable_rdp_compositor = xyes; then
AC_DEFINE([BUILD_RDP_COMPOSITOR], [1], [Build the RDP compositor])
- PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp >= 1.1.0])
+ PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp2 >= 2.0.0],
+ [],
+ [PKG_CHECK_MODULES(RDP_COMPOSITOR, [freerdp >= 1.1.0],[])]
+ )
SAVED_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $RDP_COMPOSITOR_CFLAGS"