AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests 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
commit 6f36d2e2f8
2 changed files with 16 additions and 22 deletions
Show Stats 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"

24
configure.in
View File

@ -2622,17 +2622,6 @@ if test "$wxUSE_LIBLZMA" != "no"; then
fi
fi
dnl Disable the use of lzma, webp and zstd in built-in libtiff explicitly, as
dnl otherwise we'd depend on the system libraries, which is typically
dnl undesirable when using builtin libraries. If we use lzma ourselves, keep it
dnl enabled.
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
dnl ------------------------------------------------------------------------
dnl Check for jbig library
dnl ------------------------------------------------------------------------
@ -2640,8 +2629,6 @@ dnl ------------------------------------------------------------------------
JBIG_LINK=
if test "$wxUSE_LIBJBIG" = "yes"; then
AC_CHECK_LIB(jbig, jbg_dec_init, JBIG_LINK=" -ljbig")
else
ac_configure_args="$ac_configure_args --disable-jbig"
fi
dnl ------------------------------------------------------------------------
@ -2704,6 +2691,14 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
fi
fi
if test "$wxUSE_LIBTIFF" = "builtin" ; then
dnl Disable the use of lzma, webp and zstd in built-in libtiff explicitly, as
dnl otherwise we'd depend on the system libraries, which is typically
dnl undesirable when using builtin libraries. If we use lzma ourselves, keep it
dnl enabled.
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
dnl we have to prevent the builtin libtiff configure from building the
dnl library with JPEG support as this was explicitly disabled by user,
@ -2713,6 +2708,9 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
dnl we need to hack around this
ac_configure_args="$ac_configure_args --disable-jpeg"
fi
dnl We don't provide a built-in version of the libjbig library, so
dnl disable it for the builtin libtiff.
ac_configure_args="$ac_configure_args --disable-jbig"
AC_CONFIG_SUBDIRS([src/tiff])
fi
fi