From 3be68008319160e6f08153afdeffe6461250cd91 Mon Sep 17 00:00:00 2001 From: Tim Stahlhut Date: Mon, 14 Jun 2021 09:19:48 -0400 Subject: [PATCH] Disable libdeflate when using built-in libtiff This is another library that can be detected and used by libtiff configure that we don't want to use, as built-in libraries shouldn't have any external dependencies, so explicitly disable its use, just as it was already done for libjbig, libwebp and libzstd, see ec4b71afa0 (Update tiff submodule, 2018-11-17) and b7600b0b1b (Ensure jbig support is disabled for builtin libtiff, 2020-06-17). Closes https://github.com/wxWidgets/wxWidgets/pull/2394 --- configure | 1 + configure.in | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure b/configure index f6f7ee9e0e..a5333101af 100755 --- a/configure +++ b/configure @@ -22526,6 +22526,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix ax_args="--disable-option-checking $ax_args" # Options that must be added as they are provided. as_fn_append ax_args " '--disable-jbig'" + as_fn_append ax_args " '--disable-libdeflate'" as_fn_append ax_args " '--disable-webp'" as_fn_append ax_args " '--disable-zstd'" as_fn_append ax_args " '$tiff_lzma_option'" diff --git a/configure.in b/configure.in index f137c92fb1..b8c03c11ca 100644 --- a/configure.in +++ b/configure.in @@ -2790,7 +2790,7 @@ if test "$wxUSE_LIBTIFF" != "no" ; then AC_MSG_RESULT([yes]) fi - dnl Disable the use of lzma, jbig, webp and zstd in built-in libtiff + dnl Disable the use of the external libraries in the built-in libtiff dnl explicitly, as otherwise we'd depend on the system libraries, which dnl is typically undesirable when using builtin libraries. If we use dnl lzma ourselves, keep it enabled (note that we must still define the @@ -2814,6 +2814,7 @@ if test "$wxUSE_LIBTIFF" != "no" ; then AX_SUBDIRS_CONFIGURE([src/tiff], [[--disable-jbig], + [--disable-libdeflate], [--disable-webp], [--disable-zstd], [$tiff_lzma_option],