From 50d8a3378200319c227528231cbb2ab5b72ca8b2 Mon Sep 17 00:00:00 2001 From: Christian Beier Date: Thu, 1 Dec 2011 18:22:44 +0100 Subject: [PATCH] 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. --- libvncserver/Makefile.am | 4 ---- 1 file changed, 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