aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2008-04-16 12:36:28 +0000
committerAdam Tkac <atkac@redhat.com>2008-04-16 12:36:28 +0000
commit547117a467c9e812fa6f23adfff76c6ebcd61536 (patch)
treeec1f5f3d6e17e57f56cc8f738cea9006316f70c9
parent1c8b98d40398ba57b92595871da6ba9a5687fe63 (diff)
downloadtigervnc-547117a467c9e812fa6f23adfff76c6ebcd61536.tar.gz
tigervnc-547117a467c9e812fa6f23adfff76c6ebcd61536.zip
- add libz to librdr.la to avoid tight/system zlib checking in xserver configure
- add libjpeg to librfb.la to avoid tight/system libjpeg checking in xserver configure git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2481 3789f03b-4d11-0410-bbf8-ca57d06f2519
-rw-r--r--common/rdr/Makefile.am2
-rw-r--r--common/rfb/Makefile.am2
2 files changed, 4 insertions, 0 deletions
diff --git a/common/rdr/Makefile.am b/common/rdr/Makefile.am
index 0e888963..b9e7eb75 100644
--- a/common/rdr/Makefile.am
+++ b/common/rdr/Makefile.am
@@ -5,3 +5,5 @@ librdr_la_SOURCES = Exception.cxx FdInStream.cxx FdOutStream.cxx InStream.cxx \
HexOutStream.cxx
librdr_la_CPPFLAGS = -I$(top_srcdir) @ZLIB_INCLUDE@
+
+librdr_la_LIBADD = @ZLIB_LIB@
diff --git a/common/rfb/Makefile.am b/common/rfb/Makefile.am
index 8226fa6c..2f9e72e7 100644
--- a/common/rfb/Makefile.am
+++ b/common/rfb/Makefile.am
@@ -29,3 +29,5 @@ endif
librfb_la_CPPFLAGS = -I$(top_srcdir) @JPEG_INCLUDE@ @VSNPRINTF_DEFINE@ \
@STRCASECMP_DEFINE@ @STRNCASECMP_DEFINE@
+
+librfb_la_LIBADD = @JPEG_LIB@