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

Don't link with system lzma and jbig when using built-in libtiff

Browse Source 
It doesn't make much sense to have dependencies on the system libraries when
using a built-in library as this makes the binaries using wxWidgets unportable
to the systems without the matching versions of these libraries which was
probably the goal if the built-in library is used.
This commit is contained in:
Vadim Zeitlin 2016-02-01 00:54:58 +01:00
parent 8581f6851e
commit a0548db9f5
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -4765,6 +4765,11 @@ $as_echo "builtin version" >&6; }
fi
if test "$wxUSE_LIBTIFF" = "builtin" ; then
wxUSE_LIBJBIG=no
wxUSE_LIBLZMA=no
else
withstring=without
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
@ -4852,6 +4857,8 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
$as_echo "$result" >&6; }
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libxpm" >&5
$as_echo_n "checking for --with-libxpm... " >&6; }

13
configure.in
View File

@ -531,8 +531,17 @@ dnl ---------------------------------------------------------------------------
WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG)
WX_ARG_SYS_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
WX_ARG_SYS_WITH(libtiff, [ --with-libtiff use libtiff (TIFF file format)], wxUSE_LIBTIFF)
WX_ARG_WITHOUT(libjbig, [ --without-libjbig don't use libjbig in libtiff even if available)], wxUSE_LIBJBIG)
WX_ARG_WITHOUT(liblzma, [ --without-liblzma don't use liblzma in libtiff even if available)], wxUSE_LIBLZMA)
dnl We don't provide built-in versions of these libraries, so if the use of
dnl system libraries is explicitly disabled, we can't use them at all.
if test "$wxUSE_LIBTIFF" = "builtin" ; then
wxUSE_LIBJBIG=no
wxUSE_LIBLZMA=no
else
WX_ARG_WITHOUT(libjbig, [ --without-libjbig don't use libjbig in libtiff even if available)], wxUSE_LIBJBIG)
WX_ARG_WITHOUT(liblzma, [ --without-liblzma don't use liblzma in libtiff even if available)], wxUSE_LIBLZMA)
fi
WX_ARG_SYS_WITH(libxpm, [ --with-libxpm use libxpm (XPM file format)], wxUSE_LIBXPM)
WX_ARG_WITH(libiconv, [ --with-libiconv use libiconv (character conversion)], wxUSE_LIBICONV)
WX_ARG_WITH(libmspack, [ --with-libmspack use libmspack (CHM help files loading)], wxUSE_LIBMSPACK)