You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2018/02/07 04:55:37 UTC

[1/2] guacamole-server git commit: GUACAMOLE-485: Disable build of terminal emulator if Pango was manually disabled.

Repository: guacamole-server
Updated Branches:
  refs/heads/master 4d7191147 -> 1cf86e12a


GUACAMOLE-485: Disable build of terminal emulator if Pango was manually disabled.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/d75a18e6
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/d75a18e6
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/d75a18e6

Branch: refs/heads/master
Commit: d75a18e60343552d3d306ca2f964a59e06b81024
Parents: 4d71911
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Feb 6 20:21:14 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Feb 6 20:21:14 2018 -0800

----------------------------------------------------------------------
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/d75a18e6/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 8ae0743..42e8197 100644
--- a/configure.ac
+++ b/configure.ac
@@ -419,7 +419,7 @@ AC_ARG_WITH([terminal],
 if test "x$with_terminal" != "xno"
 then
     have_terminal=yes
-    if test "x${have_pango}" = "xno"
+    if test "x${have_pango}" != "xyes"
     then
         have_terminal=no
     fi


[2/2] guacamole-server git commit: GUACAMOLE-485: Merge terminal emulator build fix.

Posted by jm...@apache.org.
GUACAMOLE-485: Merge terminal emulator build fix.


Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/1cf86e12
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/1cf86e12
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/1cf86e12

Branch: refs/heads/master
Commit: 1cf86e12a1572531d425f70eed1cec1a45b5331b
Parents: 4d71911 d75a18e
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Feb 6 20:54:56 2018 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Feb 6 20:54:56 2018 -0800

----------------------------------------------------------------------
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------