Revision: 4159
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4159&view=rev
Author: dcommander
Date: 2010-10-01 09:55:03 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
Previous fix for statically linking against GnuTLS on OS X broke the build on
Linux when using the included Zlib. This fixes it.
Modified Paths:
--------------
trunk/unix/vncviewer/Makefile.am
trunk/unix/x0vncserver/Makefile.am
Modified: trunk/unix/vncviewer/Makefile.am
===================================================================
--- trunk/unix/vncviewer/Makefile.am 2010-10-01 09:31:44 UTC (rev 4158)
+++ trunk/unix/vncviewer/Makefile.am 2010-10-01 09:55:03 UTC (rev 4159)
@@ -18,4 +18,8 @@
$(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
Modified: trunk/unix/x0vncserver/Makefile.am
===================================================================
--- trunk/unix/x0vncserver/Makefile.am 2010-10-01 09:31:44 UTC (rev 4158)
+++ trunk/unix/x0vncserver/Makefile.am 2010-10-01 09:55:03 UTC (rev 4159)
@@ -21,4 +21,8 @@
$(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
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
