diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-10-01 09:55:03 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-10-01 09:55:03 +0000 |
| commit | 23b3f5c4980bd206a8f993265dc3b0790eddd5ec (patch) | |
| tree | f3000964163d4d098981a4858dd8831fa42f0b8f /unix/x0vncserver | |
| parent | 2e0b9654bbf5323348139ac2717c9a5a01974ce5 (diff) | |
| download | tigervnc-23b3f5c4980bd206a8f993265dc3b0790eddd5ec.tar.gz tigervnc-23b3f5c4980bd206a8f993265dc3b0790eddd5ec.zip | |
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
Diffstat (limited to 'unix/x0vncserver')
| -rw-r--r-- | unix/x0vncserver/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
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 |