Changeset View
Changeset View
Standalone View
Standalone View
head/net/vinagre/files/patch-configure.ac
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| From 8d072483ffff3a4e752c35811fb562f61d206f68 Mon Sep 17 00:00:00 2001 | |||||
| From: Adam Williamson <awilliam@redhat.com> | |||||
| Date: Fri, 22 Apr 2016 14:54:09 -0700 | |||||
| Subject: [PATCH] handle new freerdp pkgconfig name | |||||
| freerdp has now changed its pkgconfig name to 'freerdp2' - | |||||
| https://github.com/FreeRDP/FreeRDP/commit/6fa36081 . Assuming | |||||
| we can build against both 1 and 2, we should handle both names. | |||||
| --- configure.ac.orig 2016-09-20 06:02:32 UTC | |||||
| +++ configure.ac | |||||
| @@ -59,6 +59,7 @@ AM_CONDITIONAL([VINAGRE_ENABLE_SSH], [te | |||||
| # Whether to enable support for RDP. | |||||
| RDP_DEPS="freerdp x11" | |||||
| +RDP_2_DEPS="freerdp2 x11" | |||||
| AC_ARG_ENABLE([rdp], | |||||
| [AS_HELP_STRING([--disable-rdp], | |||||
| [Disable Remote Desktop Protocol (RDP) support])]) | |||||
| @@ -68,7 +69,10 @@ AS_IF([test "x$enable_rdp" != "xno"], | |||||
| [have_rdp=yes | |||||
| PKG_CHECK_EXISTS(freerdp >= 1.1, | |||||
| [AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [])], | |||||
| - [have_rdp=no])], | |||||
| + [PKG_CHECK_EXISTS([$RDP_2_DEPS], | |||||
| + [have_rdp=yes | |||||
| + RDP_DEPS=$RDP_2_DEPS | |||||
| + AC_DEFINE([HAVE_FREERDP_1_1], [1], [FreeRDP is of version 1.1 or newer])], [have_rdp=no])])], | |||||
| [have_rdp=no]) | |||||
| AS_IF([test "x$have_rdp" = "xyes"], | |||||