Revision: 4267
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4267&view=rev
Author: dcommander
Date: 2011-02-09 03:37:00 +0000 (Wed, 09 Feb 2011)
Log Message:
-----------
Allow GnuTLS to use in-tree version of zlib when static linking
Modified Paths:
--------------
trunk/common/rdr/Makefile.am
trunk/configure.ac
Modified: trunk/common/rdr/Makefile.am
===================================================================
--- trunk/common/rdr/Makefile.am 2011-02-09 03:27:26 UTC (rev 4266)
+++ trunk/common/rdr/Makefile.am 2011-02-09 03:37:00 UTC (rev 4267)
@@ -17,6 +17,10 @@
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
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-02-09 03:27:26 UTC (rev 4266)
+++ trunk/configure.ac 2011-02-09 03:37:00 UTC (rev 4267)
@@ -90,11 +90,11 @@
GNUTLS_LIBS=
if test "x$enable_gnutls" = xyes; then
if test "x$GNUTLS_LDFLAGS" = "x"; then
- GNUTLS_LDFLAGS='-lgnutls -lgcrypt -lgpg-error -lz'
+ GNUTLS_LDFLAGS='-lgnutls -lgcrypt -lgpg-error'
AC_CHECK_LIB([tasn1], [asn1_create_element],
[GNUTLS_LDFLAGS="${GNUTLS_LDFLAGS} -ltasn1"])
fi
SAVE_LIBS=${LIBS}
- LIBS="${LIBS} ${GNUTLS_LDFLAGS}"
+ LIBS="${LIBS} ${GNUTLS_LDFLAGS} -lz"
SAVE_CPPFLAGS=${CPPFLAGS}
CPPFLAGS="${CPPFLAGS} ${GNUTLS_CFLAGS}"
AC_MSG_CHECKING([for GnuTLS library])
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
