|
 |
ccf9f0 |
From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001
|
|
|
ccf9f0 |
From: Adam Williamson <awilliam@redhat.com>
|
|
|
ccf9f0 |
Date: Fri, 22 Apr 2016 14:54:09 -0700
|
|
|
ccf9f0 |
Subject: [PATCH] handle new freerdp pkgconfig name
|
|
|
ccf9f0 |
|
|
|
ccf9f0 |
freerdp has now changed its pkgconfig name to 'freerdp2' -
|
|
|
ccf9f0 |
https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming
|
|
|
ccf9f0 |
we can build against both 1 and 2, we should handle both names.
|
|
|
ccf9f0 |
---
|
|
|
ccf9f0 |
configure.ac | 6 +++++-
|
|
|
ccf9f0 |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
ccf9f0 |
|
|
|
ccf9f0 |
diff --git a/configure.ac b/configure.ac
|
|
|
ccf9f0 |
index 585c016..362951d 100644
|
|
|
ccf9f0 |
--- a/configure.ac
|
|
|
ccf9f0 |
+++ b/configure.ac
|
|
|
ccf9f0 |
@@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [test "x$have_ssh" = "xyes"])
|
|
|
ccf9f0 |
|
|
|
ccf9f0 |
# Whether to enable support for RDP.
|
|
|
ccf9f0 |
RDP_DEPS="freerdp x11"
|
|
|
ccf9f0 |
+RDP_2_DEPS="freerdp2 x11"
|
|
|
ccf9f0 |
AC_ARG_ENABLE([rdp],
|
|
|
ccf9f0 |
[AS_HELP_STRING([--disable-rdp],
|
|
|
ccf9f0 |
[Disable Remote Desktop Protocol (RDP) support])])
|
|
|
ccf9f0 |
@@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"],
|
|
|
ccf9f0 |
[have_rdp=yes
|
|
|
ccf9f0 |
PKG_CHECK_EXISTS(freerdp >= 1.1,
|
|
|
ccf9f0 |
[AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])],
|
|
|
ccf9f0 |
- [have_rdp=no])],
|
|
|
ccf9f0 |
+ [PKG_CHECK_EXISTS([$RDP_2_DEPS],
|
|
|
ccf9f0 |
+ [have_rdp=yes
|
|
|
ccf9f0 |
+ RDP_DEPS=$RDP_2_DEPS
|
|
|
ccf9f0 |
+ AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])],
|
|
|
ccf9f0 |
[have_rdp=no])
|
|
|
ccf9f0 |
|
|
|
ccf9f0 |
AS_IF([test "x$have_rdp" = "xyes"],
|
|
|
ccf9f0 |
--
|
|
|
ccf9f0 |
2.7.3
|
|
|
ccf9f0 |
|