From: DRC <dcommander@users.sourceforge.net>
Date: Fri, 1 Oct 2010 09:55:03 +0000 (+0000)
Subject: Previous fix for statically linking against GnuTLS on OS X broke the build on Linux... 
X-Git-Tag: v1.0.90~155
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=23b3f5c4980bd206a8f993265dc3b0790eddd5ec;p=tigervnc.git

Previous fix for statically linking against GnuTLS on OS X broke the build on Linux when using the included Zlib.  This fixes it.


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

diff --git a/unix/vncviewer/Makefile.am b/unix/vncviewer/Makefile.am
index 2b1e9664..cfbe430f 100644
--- a/unix/vncviewer/Makefile.am
+++ b/unix/vncviewer/Makefile.am
@@ -18,4 +18,8 @@ vncviewer_LDADD = $(top_builddir)/unix/tx/libtx.la \
 	$(top_builddir)/common/rdr/librdr.la \
 	@X_PRE_LIBS@ @X_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ @GNUTLS_LIBS@ # @LIBINTL@
 
+if INCLUDED_ZLIB
+vncviewer_LDADD += $(top_builddir)/common/zlib/libz.la
+endif
+
 EXTRA_DIST = vncviewer.man
diff --git a/unix/x0vncserver/Makefile.am b/unix/x0vncserver/Makefile.am
index 80a27b35..b37537c1 100644
--- a/unix/x0vncserver/Makefile.am
+++ b/unix/x0vncserver/Makefile.am
@@ -21,4 +21,8 @@ x0vncserver_LDADD = $(top_builddir)/common/rfb/librfb.la \
 	$(top_builddir)/unix/tx/libtx.la @INET_LIB@ @X_PRE_LIBS@ @X_LIBS@ \
 	@XTEST_LIB@ -lXext -lX11 @X_EXTRA_LIBS@ @GNUTLS_LIBS@
 
+if INCLUDED_ZLIB
+x0vncserver_LDADD += $(top_builddir)/common/zlib/libz.la
+endif
+
 EXTRA_DIST = x0vncserver.man