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 2017/11/06 19:29:53 UTC
[1/3] incubator-guacamole-server git commit: GUACAMOLE-296: Revert
manual addition of winpr-utils library.
Repository: incubator-guacamole-server
Updated Branches:
refs/heads/master 95be88be1 -> 025fc0525
GUACAMOLE-296: Revert manual addition of winpr-utils library.
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/b9f8e13d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/b9f8e13d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/b9f8e13d
Branch: refs/heads/master
Commit: b9f8e13d80e30b3031a7d77bd2204ad193ea7e79
Parents: caedf26
Author: Nick Couchman <vn...@apache.org>
Authored: Mon Nov 6 12:20:25 2017 -0500
Committer: Nick Couchman <vn...@apache.org>
Committed: Mon Nov 6 12:20:56 2017 -0500
----------------------------------------------------------------------
configure.ac | 4 +---
src/protocols/rdp/Makefile.am | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/b9f8e13d/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8725748..e04d581 100644
--- a/configure.ac
+++ b/configure.ac
@@ -506,7 +506,6 @@ fi
have_freerdp=disabled
RDP_LIBS=
-WINPR_LIBS=
AC_ARG_WITH([rdp],
[AS_HELP_STRING([--with-rdp],
[support RDP @<:@default=check@:>@])],
@@ -696,7 +695,7 @@ fi
# Check for stream support via WinPR
if test "x${have_freerdp}" = "xyes"
then
- AC_CHECK_HEADER(winpr/stream.h,[WINPR_LIBS="$WINPR_LIBS -lwinpr-utils"],
+ AC_CHECK_HEADER(winpr/stream.h,,
[have_winpr=no,
AC_CHECK_DECL([stream_write_uint8],,
[AC_MSG_WARN([
@@ -1016,7 +1015,6 @@ AM_CONDITIONAL([ENABLE_WINPR], [test "x${have_winpr}" = "xyes"])
AM_CONDITIONAL([ENABLE_RDP], [test "x${have_freerdp}" = "xyes"])
AC_SUBST(RDP_LIBS)
-AC_SUBST(WINPR_LIBS)
#
# libssh2
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/b9f8e13d/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index f9fa62a..2a2ebca 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -185,8 +185,7 @@ guacai_cflags = \
guacai_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
- @RDP_LIBS@ \
- @WINPR_LIBS@
+ @RDP_LIBS@
guacai_libadd = \
@COMMON_LTLIB@ \
[3/3] incubator-guacamole-server git commit: Merge 0.9.14-incubating
changes back to master.
Posted by mj...@apache.org.
Merge 0.9.14-incubating changes back to master.
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/025fc052
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/025fc052
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/025fc052
Branch: refs/heads/master
Commit: 025fc0525f28b05be206d1471e2d8d488f97cb14
Parents: 95be88b 233f5e2
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Nov 6 11:29:37 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Nov 6 11:29:37 2017 -0800
----------------------------------------------------------------------
configure.ac | 4 +---
src/protocols/rdp/Makefile.am | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-guacamole-server git commit: GUACAMOLE-296: Merge
changes reverting explicit linking of libwinpr-utils.
Posted by mj...@apache.org.
GUACAMOLE-296: Merge changes reverting explicit linking of libwinpr-utils.
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/233f5e27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/233f5e27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/233f5e27
Branch: refs/heads/master
Commit: 233f5e27e2e4af6a0787913c0223b8252c8a95aa
Parents: 95be88b b9f8e13
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Nov 6 11:24:39 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Nov 6 11:24:39 2017 -0800
----------------------------------------------------------------------
configure.ac | 4 +---
src/protocols/rdp/Makefile.am | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/233f5e27/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------