You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2016/03/20 03:24:52 UTC
[22/50] incubator-guacamole-server git commit: GUAC-1164:
rdp_disp.[ch] must now be built in all cases.
GUAC-1164: rdp_disp.[ch] must now be built in all cases.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/commit/81ebfbb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/81ebfbb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/81ebfbb5
Branch: refs/heads/master
Commit: 81ebfbb5ca5beecf9e3eb6799c082d4de4579979
Parents: 4e2b90c
Author: Michael Jumper <mi...@guac-dev.org>
Authored: Tue Mar 15 22:02:35 2016 -0700
Committer: Michael Jumper <mi...@guac-dev.org>
Committed: Tue Mar 15 22:02:35 2016 -0700
----------------------------------------------------------------------
configure.ac | 5 +----
src/protocols/rdp/Makefile.am | 8 ++------
2 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/81ebfbb5/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index a818fee..9d36bb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -437,7 +437,6 @@ if test "x$with_rdp" != "xno"
then
have_winpr=yes
have_freerdp=yes
- have_disp=yes
legacy_freerdp_extensions=no
rdpsettings_interface=unknown
rdpsettings_audioplayback=yes
@@ -554,8 +553,7 @@ then
[AC_DEFINE([HAVE_FREERDP_DISPLAY_UPDATE_SUPPORT],,
[Whether FreeRDP supports the display update channel])]
[AC_CHECK_MEMBERS([rdpSettings.SupportDisplayControl],,,
- [[#include <freerdp/freerdp.h>]])],
- have_disp=no,
+ [[#include <freerdp/freerdp.h>]])],,
[#include <winpr/wtypes.h>
#include <winpr/collections.h>])
fi
@@ -869,7 +867,6 @@ then
fi
AM_CONDITIONAL([LEGACY_FREERDP_EXTENSIONS], [test "x${legacy_freerdp_extensions}" = "xyes"])
-AM_CONDITIONAL([ENABLE_DISPLAY_UPDATE], [test "x${have_disp}" = "xyes"])
AM_CONDITIONAL([ENABLE_WINPR], [test "x${have_winpr}" = "xyes"])
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp}" = "xyes"])
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/81ebfbb5/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 69492a1..3160b57 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -33,6 +33,7 @@ libguac_client_rdp_la_SOURCES = \
rdp_bitmap.c \
rdp_cliprdr.c \
rdp_color.c \
+ rdp_disp.c \
rdp_fs.c \
rdp_gdi.c \
rdp_glyph.c \
@@ -87,6 +88,7 @@ noinst_HEADERS = \
rdp_bitmap.h \
rdp_cliprdr.h \
rdp_color.h \
+ rdp_disp.h \
rdp_fs.h \
rdp_gdi.h \
rdp_glyph.h \
@@ -110,12 +112,6 @@ guacsnd_sources += compat/winpr-stream.c
guacdr_sources += compat/winpr-stream.c
endif
-# Add display update channel support, if supported by FreeRDP
-if ENABLE_DISPLAY_UPDATE
-noinst_HEADERS += rdp_disp.h
-libguac_client_rdp_la_SOURCES += rdp_disp.c
-endif
-
#
# Main RDP client library
#