From b2ec261b3a9a123e6f384ab30f89689f2cf90003 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 9 Oct 2014 18:10:46 +0200 Subject: [PATCH] libgeotiff: explicit optional dependencies on zlib and jpeg In order to provide consistent behavior, this commit explicits the optional dependencies of libgeotiff on zlib and jpeg. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libgeotiff/libgeotiff.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/libgeotiff/libgeotiff.mk b/package/libgeotiff/libgeotiff.mk index 722e71c6f..61f5c219c 100644 --- a/package/libgeotiff/libgeotiff.mk +++ b/package/libgeotiff/libgeotiff.mk @@ -10,4 +10,18 @@ LIBGEOTIFF_DEPENDENCIES = tiff host-pkgconf LIBGEOTIFF_INSTALL_STAGING = YES LIBGEOTIFF_AUTORECONF = YES +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBGEOTIFF_DEPENDENCIES += zlib +LIBGEOTIFF_CONF_OPTS += --with-zlib +else +LIBGEOTIFF_CONF_OPTS += --without-zlib +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +LIBGEOTIFF_DEPENDENCIES += jpeg +LIBGEOTIFF_CONF_OPTS += --with-jpeg +else +LIBGEOTIFF_CONF_OPTS += --without-jpeg +endif + $(eval $(autotools-package))