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

Merge branch 'im/buildfix' of https://github.com/imciner2/wxWidgets

Browse Source 
Fix disabling unwanted libraries when building built-in libtiff.

See https://github.com/wxWidgets/wxWidgets/pull/1897

Closes #18791.
This commit is contained in:
Vadim Zeitlin
2020-06-20 14:49:23 +02:00
parent 915dcce320 b7600b0b1b
commit 6f36d2e2f8
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@@ -21854,13 +21854,6 @@ fi
fi
fi
if test "$wxUSE_LIBTIFF" = "builtin"; then
ac_configure_args="$ac_configure_args --disable-webp --disable-zstd"
if test "$wxUSE_LIBLZMA" = "no"; then
ac_configure_args="$ac_configure_args --disable-lzma"
fi
fi
JBIG_LINK=
if test "$wxUSE_LIBJBIG" = "yes"; then
@@ -21904,8 +21897,6 @@ if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then :
JBIG_LINK=" -ljbig"
fi
else
ac_configure_args="$ac_configure_args --disable-jbig"
fi
@@ -22135,9 +22126,14 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst
fi
fi
if test "$wxUSE_LIBTIFF" = "builtin" ; then
ac_configure_args="$ac_configure_args --disable-webp --disable-zstd"
if test "$wxUSE_LIBLZMA" = "no"; then
ac_configure_args="$ac_configure_args --disable-lzma"
fi
if test "$wxUSE_LIBJPEG" = "no"; then
ac_configure_args="$ac_configure_args --disable-jpeg"
fi
ac_configure_args="$ac_configure_args --disable-jbig"
subdirs="$subdirs src/tiff"