From c61037c4a68e14a1924ac4399e8b9c92054ffab4 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 17 Dec 2016 20:59:57 -0800 Subject: [PATCH 1/4] GUACAMOLE-143: Include DISCLAIMER and NOTICE within source .tar.gz. --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index bf1fac13..715c9ddc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,7 +71,9 @@ SUBDIRS += src/guacenc endif EXTRA_DIST = \ + DISCLAIMER \ LICENSE \ + NOTICE \ bin/guacctl \ doc/Doxyfile From 2a55474c92145f0fbfac6e2cbfeff9e1d1d40671 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 17 Dec 2016 21:09:17 -0800 Subject: [PATCH 2/4] GUACAMOLE-143: Include CONTRIBUTING within source .tar.gz. --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index 715c9ddc..8489012a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,6 +71,7 @@ SUBDIRS += src/guacenc endif EXTRA_DIST = \ + CONTRIBUTING \ DISCLAIMER \ LICENSE \ NOTICE \ From 6101be6234a4c3c37754d37a98a45b02926e1cfe Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 17 Dec 2016 21:15:13 -0800 Subject: [PATCH 3/4] GUACAMOLE-143: Include guacd-docker within source .tar.gz. --- Makefile.am | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8489012a..54899e99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,11 +70,14 @@ if ENABLE_GUACENC SUBDIRS += src/guacenc endif -EXTRA_DIST = \ - CONTRIBUTING \ - DISCLAIMER \ - LICENSE \ - NOTICE \ - bin/guacctl \ - doc/Doxyfile +EXTRA_DIST = \ + .dockerignore \ + CONTRIBUTING \ + DISCLAIMER \ + Dockerfile \ + LICENSE \ + NOTICE \ + bin/guacctl \ + doc/Doxyfile \ + src/guacd-docker From 40cc1536af5b186e1f1479a4ea2ea3bc17c5b66f Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sat, 17 Dec 2016 22:00:55 -0800 Subject: [PATCH 4/4] GUACAMOLE-145: Update README to include (correct) required and optional dependencies. --- README | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) diff --git a/README b/README index f16ead9b..ac017e7e 100644 --- a/README +++ b/README @@ -31,14 +31,69 @@ access, but would be easy for JavaScript programs to process. guacd is the proxy which translates between arbitrary protocols and the Guacamole protocol. +------------------------------------------------------------ + Required dependencies +------------------------------------------------------------ + +All software within guacamole-server is built using the popular GNU Automake, +and thus provides the standard configure script. Before compiling, at least +the following required dependencies must already be installed: + + 1) Cairo (http://cairographics.org/) + + 2) libjpeg-turbo (http://libjpeg-turbo.virtualgl.org/) + OR libjpeg (http://www.ijg.org/) + + 3) libpng (http://www.libpng.org/pub/png/libpng.html) + + 4) OSSP UUID (http://www.ossp.org/pkg/lib/uuid/) + + +------------------------------------------------------------ + Optional dependencies +------------------------------------------------------------ + +In addition, the following optional dependencies may be installed in order to +enable optional features of Guacamole. Note that while the various supported +protocols are technically optional, you will no doubt wish to install the +dependencies of at least ONE supported protocol, as Guacamole would be useless +otherwise. + + RDP: + * FreeRDP (http://www.freerdp.com/) + + SSH: + * libssh2 (http://www.libssh2.org/) + * OpenSSL (https://www.openssl.org/) + * Pango (http://www.pango.org/) + + Telnet: + * libtelnet (https://github.com/seanmiddleditch/libtelnet) + * Pango (http://www.pango.org/) + + VNC: + * libVNCserver (http://libvnc.github.io/) + + Support for audio within VNC: + * PulseAudio (http://www.freedesktop.org/wiki/Software/PulseAudio/) + + Support for SFTP file transfer for VNC or RDP: + * libssh2 (http://www.libssh2.org/) + * OpenSSL (https://www.openssl.org/) + + Support for WebP image compression: + * libwebp (https://developers.google.com/speed/webp/) + + "guacenc" video encoding utility: + * FFmpeg (https://ffmpeg.org/) + + ------------------------------------------------------------ Compiling and installing guacd, libguac, etc. ------------------------------------------------------------ All software within guacamole-server is built using the popular GNU Automake, -and thus provides the standard configure script. Before compiling, you need to -have compiled and installed libguac, the core Guacamole library. This is -available from the main Apache Guacamole site at http://guacamole.incubator.apache.org/. +and thus provides the standard configure script. 1) Run configure