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/10/15 06:47:08 UTC
[2/3] incubator-guacamole-server git commit: GUACAMOLE-296: Break out
WINPR libs into their own variable.
GUACAMOLE-296: Break out WINPR libs into their own variable.
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/caedf26a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/tree/caedf26a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/diff/caedf26a
Branch: refs/heads/master
Commit: caedf26a065e8ed70a9ed044a7451ebf78231506
Parents: 9487eb2
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Oct 13 21:25:32 2017 -0400
Committer: Nick Couchman <vn...@apache.org>
Committed: Fri Oct 13 21:25:32 2017 -0400
----------------------------------------------------------------------
configure.ac | 4 +++-
src/protocols/rdp/Makefile.am | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-server/blob/caedf26a/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index fb12fb4..8725748 100644
--- a/configure.ac
+++ b/configure.ac
@@ -506,6 +506,7 @@ fi
have_freerdp=disabled
RDP_LIBS=
+WINPR_LIBS=
AC_ARG_WITH([rdp],
[AS_HELP_STRING([--with-rdp],
[support RDP @<:@default=check@:>@])],
@@ -695,7 +696,7 @@ fi
# Check for stream support via WinPR
if test "x${have_freerdp}" = "xyes"
then
- AC_CHECK_HEADER(winpr/stream.h,[RDP_LIBS="$RDP_LIBS -lwinpr-utils"],
+ AC_CHECK_HEADER(winpr/stream.h,[WINPR_LIBS="$WINPR_LIBS -lwinpr-utils"],
[have_winpr=no,
AC_CHECK_DECL([stream_write_uint8],,
[AC_MSG_WARN([
@@ -1015,6 +1016,7 @@ 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/caedf26a/src/protocols/rdp/Makefile.am
----------------------------------------------------------------------
diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 2a2ebca..f9fa62a 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -185,7 +185,8 @@ guacai_cflags = \
guacai_ldflags = \
-module -avoid-version -shared \
@PTHREAD_LIBS@ \
- @RDP_LIBS@
+ @RDP_LIBS@ \
+ @WINPR_LIBS@
guacai_libadd = \
@COMMON_LTLIB@ \