diff options
| author | Christian Beier <dontmind@freeshell.org> | 2011-12-01 18:22:44 +0100 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2011-12-01 18:22:44 +0100 |
| commit | 50d8a3378200319c227528231cbb2ab5b72ca8b2 (patch) | |
| tree | d799b1e704b65fce09a9393543dea3aa853b3998 | |
| parent | c42ea2fa7c025074bff706cbd92b478c39d08aa9 (diff) | |
| download | libtdevnc-50d8a3378200319c227528231cbb2ab5b72ca8b2.tar.gz libtdevnc-50d8a3378200319c227528231cbb2ab5b72ca8b2.zip | |
Fix build error when libpng is available, but libjpeg is not.
The png stuff in tight.c depends on code in tight.c that uses libjpeg
features. We could probably seperate that, but for now the dependency
for 'tight' goes:
PNG depends on JPEG depends on ZLIB.
This is reflected in Makefile.am now.
NB: Building tight.c with JPEG but without PNG is still possible,
but nor the other way around.
| -rw-r--r-- | libvncserver/Makefile.am | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am index 287f1c9..fce398d 100644 --- a/libvncserver/Makefile.am +++ b/libvncserver/Makefile.am @@ -47,10 +47,6 @@ if HAVE_LIBZ ZLIBSRCS = zlib.c zrle.c zrleoutstream.c zrlepalettehelper.c ../common/zywrletemplate.c if HAVE_LIBJPEG TIGHTSRCS = tight.c -else -if HAVE_LIBPNG -TIGHTSRCS = tight.c -endif endif endif |