From 2242e98a4c0821ea352ffa22b57d9c32d242fc5c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 20 Oct 2018 18:14:47 +0200 Subject: [PATCH] Disable the use of liblzma in libtiff if detecting it failed We only disabled LZMA support in libtiff if --without-liblzma was explicitly specified, but we need to do it also if liblzma wasn't detected because libtiff configure might erroneously decide that it's available under macOS when using -isysroot, which would result in compilation errors later. And even if there were no such problem, it's still worth disabling LZMA support explicitly to skip unnecessary checking for it again in libtiff configure. --- configure | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cb8efcf19d..a13a739ad2 100755 --- a/configure +++ b/configure @@ -23371,7 +23371,7 @@ fi fi fi -if test "$HAVE_LZMA" = "no" -o "$wxUSE_LIBTIFF" = "builtin"; then +if test "$wxUSE_LIBLZMA" = "no" -a "$wxUSE_LIBTIFF" = "builtin"; then ac_configure_args="$ac_configure_args --disable-lzma" fi diff --git a/configure.in b/configure.in index 326c675a04..e168e56e6f 100644 --- a/configure.in +++ b/configure.in @@ -2585,7 +2585,7 @@ dnl We need to disable the use of lzma in built-in libtiff explicitly, as dnl otherwise we'd depend on the system lzma library, which is typically dnl undesirable when using builtin libraries. We also disable the use of lzma dnl if it's not available anyhow, just to speed up libtiff configure a little. -if test "$HAVE_LZMA" = "no" -o "$wxUSE_LIBTIFF" = "builtin"; then +if test "$wxUSE_LIBLZMA" = "no" -a "$wxUSE_LIBTIFF" = "builtin"; then ac_configure_args="$ac_configure_args --disable-lzma" fi