diff options
| author | DRC <dcommander@users.sourceforge.net> | 2011-02-09 03:37:00 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2011-02-09 03:37:00 +0000 |
| commit | 79735b4f5901b4a01a34877fd9cf0982d7e1f043 (patch) | |
| tree | 7ae88cd6a138df6ec1aaecda2f53891930673c6a /common | |
| parent | b7ab54f0df9af7f453fedf5143ac18055e4bd52e (diff) | |
| download | tigervnc-79735b4f5901b4a01a34877fd9cf0982d7e1f043.tar.gz tigervnc-79735b4f5901b4a01a34877fd9cf0982d7e1f043.zip | |
Allow GnuTLS to use in-tree version of zlib when static linking
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4267 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common')
| -rw-r--r-- | common/rdr/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/rdr/Makefile.am b/common/rdr/Makefile.am index ef911c24..9fdea7ed 100644 --- a/common/rdr/Makefile.am +++ b/common/rdr/Makefile.am @@ -17,6 +17,10 @@ librdr_la_LIBADD = @GNUTLS_LIBS@ if INCLUDED_ZLIB librdr_la_CPPFLAGS += -I$(top_srcdir)/common/zlib librdr_la_LIBADD += $(top_builddir)/common/zlib/libz.la +else +if HAVE_GNUTLS +librdr_la_LIBADD += -lz +endif endif EXTRA_DIST = CMakeLists.txt |