Previous fix for statically linking against GnuTLS on OS X broke the build on Linux...

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 2b1e9664b7955e4f65887166116ec858b85854e8..cfbe430f5782be9438428b1df29f91429a6f6e95 100644 (file)
--- 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 80a27b3506e9d7d614c5a98424635ca6cc2bf058..b37537c153a41186bc14985739050cfdba3a2998 100644 (file)
--- 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