Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable libdeflate when using built-in libtiff

Browse Source 
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
This commit is contained in:
Tim Stahlhut
2021-06-14 09:19:48 -04:00
committed by Vadim Zeitlin
parent b52f00492e
commit 3be6800831
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@@ -22526,6 +22526,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
ax_args="--disable-option-checking $ax_args" ax_args="--disable-option-checking $ax_args"
# Options that must be added as they are provided. # Options that must be added as they are provided.
as_fn_append ax_args " '--disable-jbig'" 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-webp'"
as_fn_append ax_args " '--disable-zstd'" as_fn_append ax_args " '--disable-zstd'"
as_fn_append ax_args " '$tiff_lzma_option'" as_fn_append ax_args " '$tiff_lzma_option'"

3
configure.in
View File

@@ -2790,7 +2790,7 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
fi 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 explicitly, as otherwise we'd depend on the system libraries, which
dnl is typically undesirable when using builtin libraries. If we use dnl is typically undesirable when using builtin libraries. If we use
dnl lzma ourselves, keep it enabled (note that we must still define the 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], AX_SUBDIRS_CONFIGURE([src/tiff],
[[--disable-jbig], [[--disable-jbig],
[--disable-libdeflate],
[--disable-webp], [--disable-webp],
[--disable-zstd], [--disable-zstd],
[$tiff_lzma_option], [$tiff_lzma_option],