Support linking statically with GnuTLS on OS X

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4158 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/release/BUILDING.txt b/release/BUILDING.txt
index bfacbffdbbbe2b84b6accaa85a637bbc443001e8..4dc844125dc8fe973af4dc2c83a0f9c7893d8a02 100644 (file)
--- a/release/BUILDING.txt
+++ b/release/BUILDING.txt
@@ -165,6 +165,29 @@ Add
 to the configure command line.  The OS X 10.4 SDK must be installed.
 
 
+Building VeNCrypt support on OS X
+---------------------------------
+
+VeNCrypt requires GnuTLS, which is not available on OS X systems by default.
+However, it can be obtained from MacPorts (http://www.macports.org/).  The
+easiest way to build TigerVNC using this version of GnuTLS is simply to
+modify the CPATH and LIBRARY_PATH environment variables to include /opt/local,
+i.e.:
+
+export CPATH=/opt/local/include
+export LIBRARY_PATH=/opt/local/lib
+
+and then build TigerVNC as you would normally.  However, this produces run-time
+dependencies on the .dylib files in /opt/local/lib.  To statically link with
+GnuTLS, add the following monstrosity to the configure command line:
+
+  GNUTLS_CFLAGS=-I/opt/local/include \
+    GNUTLS_LDFLAGS='/opt/local/lib/libgnutls.a /opt/local/lib/libgcrypt.a \
+    /opt/local/lib/libgpg-error.a /opt/local/lib/libz.a \
+    /opt/local/lib/libtasn1.a /opt/local/lib/libiconv.a \
+    /opt/local/lib/libintl.a -framework CoreFoundation'
+
+
 *******************************************************************************
 **     Creating Release Packages
 *******************************************************************************

diff --git a/unix/vncviewer/Makefile.am b/unix/vncviewer/Makefile.am
index 9690015e580537c95dd0fda0928f2d3f91295c87..2b1e9664b7955e4f65887166116ec858b85854e8 100644 (file)
--- a/unix/vncviewer/Makefile.am
+++ b/unix/vncviewer/Makefile.am
@@ -16,6 +16,6 @@ vncviewer_LDADD = $(top_builddir)/unix/tx/libtx.la \
        $(top_builddir)/common/rfb/librfb.la \
        $(top_builddir)/common/network/libnetwork.la \
        $(top_builddir)/common/rdr/librdr.la \
-       @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ # @LIBINTL@
+       @X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ @GNUTLS_LIBS@ # @LIBINTL@
 
 EXTRA_DIST = vncviewer.man

diff --git a/unix/x0vncserver/Makefile.am b/unix/x0vncserver/Makefile.am
index c947257e00d71a889cdf64288d105014a6d87abe..80a27b3506e9d7d614c5a98424635ca6cc2bf058 100644 (file)
--- a/unix/x0vncserver/Makefile.am
+++ b/unix/x0vncserver/Makefile.am
@@ -19,6 +19,6 @@ x0vncserver_LDADD = $(top_builddir)/common/rfb/librfb.la \
        $(top_builddir)/common/network/libnetwork.la \
        $(top_builddir)/common/rdr/librdr.la \
        $(top_builddir)/unix/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
-       @XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@
+       @XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@ @GNUTLS_LIBS@
 
 EXTRA_DIST = x0vncserver.man