From faa2f820c6149115053deee5bc7c74ee6c3360eb Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 25 May 2012 08:58:40 +0100 Subject: [PATCH] use TIFF_CFLAGS the new pkg-config tiff4 tester outputs TOFF_CFLAGS ... use it (thanks Jay) --- ChangeLog | 1 + configure.in | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d032e833..b55745a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 19/4/12 started 7.28.6 - better resolution unit handling in deprecated im_vips2tiff() +- use TIFF_CFLAGS output from pkg-config (thanks Jay) 19/4/12 started 7.28.5 - ifthenelse blend mode was broken diff --git a/configure.in b/configure.in index 881c4b9c..66dc6b6a 100644 --- a/configure.in +++ b/configure.in @@ -663,7 +663,7 @@ fi # Gather all up for VIPS_CFLAGS, VIPS_INCLUDES, VIPS_LIBS and VIPS_CXX_LIBS # sort includes to get longer, more specific dirs first # helps, for example, selecting graphicsmagick over imagemagick -VIPS_CFLAGS=`for i in $VIPS_CFLAGS $GTHREAD_CFLAGS $REQUIRED_CFLAGS $PANGOFT2_CFLAGS $FFTW_CFLAGS $MAGICK_CFLAGS $PNG_CFLAGS $EXIF_CFLAGS $MATIO_CFLAGS $CFITSIO_CFLAGS $OPENEXR_CFLAGS $OPENSLIDE_CFLAGS $ORC_CFLAGS +VIPS_CFLAGS=`for i in $VIPS_CFLAGS $GTHREAD_CFLAGS $REQUIRED_CFLAGS $PANGOFT2_CFLAGS $FFTW_CFLAGS $MAGICK_CFLAGS $PNG_CFLAGS $EXIF_CFLAGS $MATIO_CFLAGS $CFITSIO_CFLAGS $OPENEXR_CFLAGS $OPENSLIDE_CFLAGS $ORC_CFLAGS $TIFF_CFLAGS do echo $i done | sort -ru`