[gimp] configure: clean a bit libtiff check.
- From: Jehan Pagès <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] configure: clean a bit libtiff check.
- Date: Tue, 27 Jun 2017 19:31:56 +0000 (UTC)
commit 6b094de4cdf1f8ca7c0bcb55e5f4b17cdb6754aa
Author: Jehan <jehan girinstud io>
Date: Tue Jun 27 21:10:38 2017 +0200
configure: clean a bit libtiff check.
Since commit 48046d2, libtiff is a hard dependency. So the have_libtiff
variable is not needed anymore. Just rename it and use it to output a
little bit more informative error message on libtiff check failure.
configure.ac | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e09add3..f61a4c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1362,26 +1362,25 @@ MIME_TYPES="image/bmp;image/g3fax;image/gif;image/x-fits;image/x-pcx;image/x-por
# Check for libtiff
###################
-have_libtiff=no
+libtiff_error=
if test -z "$TIFF_LIBS"; then
- have_libtiff=yes
AC_CHECK_LIB(tiff, TIFFReadScanline,
[AC_CHECK_HEADER(tiffio.h,
FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)'; TIFF_LIBS='-ltiff',
- [have_libtiff="no (TIFF header files not found)"])],
+ [libtiff_error="TIFF header files not found"])],
[AC_CHECK_LIB(tiff, TIFFWriteScanline,
[AC_CHECK_HEADER(tiffio.h,
FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)';
TIFF_LIBS='-ltiff -ljpeg -lz',
- [have_libtiff="no (TIFF header files not found)"])],
+ [libtiff_error="TIFF header files not found"])],
[AC_CHECK_LIB(tiff34, TIFFFlushData,
[AC_CHECK_HEADER(tiffio.h,
FILE_TIFF_LOAD='file-tiff-load$(EXEEXT)'; FILE_TIFF_SAVE='file-tiff-save$(EXEEXT)';
TIFF_LIBS='-ltiff34 -ljpeg -lz',
- [have_libtiff="no (TIFF header files not found)"])],
- [have_libtiff="no (TIFF library not found)"], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
+ [libtiff_error="TIFF header files not found"])],
+ [libtiff_error="TIFF library not found"], -ljpeg -lz -lm)], -ljpeg -lz -lm)], -lm)
fi
if test -z "$TIFF_LIBS"; then
- add_deps_error([libtiff], [Checks for TIFF library failed])
+ add_deps_error([libtiff], [Checks for TIFF library failed: $libtiff_error])
fi
MIME_TYPES="$MIME_TYPES;image/tiff"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]