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

Add --without-libjbig and --without-liblzma configure switches.

Browse Source 
They can be used to disable the use of the corresponding libraries by the
built-in libtiff.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74273 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-06-23 11:10:03 +00:00
parent 540dacb643
commit 1d3fe8f83e
2 changed files with 118 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
configure vendored
View File

@@ -1104,6 +1104,8 @@ enable_gpe
with_libpng
with_libjpeg
with_libtiff
with_libjbig
with_liblzma
with_libxpm
with_libiconv
with_libmspack
@@ -2332,6 +2334,8 @@ Optional Packages:
--with-libpng use libpng (PNG image format)
--with-libjpeg use libjpeg (JPEG file format)
--with-libtiff use libtiff (TIFF file format)
--without-libjbig don't use libjbig in libtiff even if available)
--without-liblzma don't use liblzma in libtiff even if available)
--with-libxpm use libxpm (XPM file format)
--with-libiconv use libiconv (character conversion)
--with-libmspack use libmspack (CHM help files loading)
@@ -4911,6 +4915,94 @@ $as_echo "builtin version" >&6; }
fi
withstring=without
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
if test x"$withstring" = xwithout; then
defaultval=yes
else
defaultval=no
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-libjbig" >&5
$as_echo_n "checking for --${withstring:-with}-libjbig... " >&6; }
# Check whether --with-libjbig was given.
if test "${with_libjbig+set}" = set; then :
withval=$with_libjbig;
if test "$withval" = yes; then
wx_cv_use_libjbig='wxUSE_LIBJBIG=yes'
else
wx_cv_use_libjbig='wxUSE_LIBJBIG=no'
fi
else
wx_cv_use_libjbig='wxUSE_LIBJBIG=${'DEFAULT_wxUSE_LIBJBIG":-$defaultval}"
fi
eval "$wx_cv_use_libjbig"
if test x"$withstring" = xwithout; then
if test $wxUSE_LIBJBIG = yes; then
result=no
else
result=yes
fi
else
result=$wxUSE_LIBJBIG
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
$as_echo "$result" >&6; }
withstring=without
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
if test x"$withstring" = xwithout; then
defaultval=yes
else
defaultval=no
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-liblzma" >&5
$as_echo_n "checking for --${withstring:-with}-liblzma... " >&6; }
# Check whether --with-liblzma was given.
if test "${with_liblzma+set}" = set; then :
withval=$with_liblzma;
if test "$withval" = yes; then
wx_cv_use_liblzma='wxUSE_LIBLZMA=yes'
else
wx_cv_use_liblzma='wxUSE_LIBLZMA=no'
fi
else
wx_cv_use_liblzma='wxUSE_LIBLZMA=${'DEFAULT_wxUSE_LIBLZMA":-$defaultval}"
fi
eval "$wx_cv_use_liblzma"
if test x"$withstring" = xwithout; then
if test $wxUSE_LIBLZMA = yes; then
result=no
else
result=yes
fi
else
result=$wxUSE_LIBLZMA
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
$as_echo "$result" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libxpm" >&5
$as_echo_n "checking for --with-libxpm... " >&6; }
@@ -22875,7 +22967,8 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst
ac_configure_args="$ac_configure_args --disable-jpeg"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5
if test "$wxUSE_LIBLZMA" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5
$as_echo_n "checking for lzma_code in -llzma... " >&6; }
if ${ac_cv_lib_lzma_lzma_code+:} false; then :
$as_echo_n "(cached) " >&6
@@ -22915,8 +23008,12 @@ if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then :
LIBS="$LIBS -llzma"
fi
else
ac_configure_args="$ac_configure_args --disable-lzma"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5
if test "$wxUSE_LIBJBIG" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5
$as_echo_n "checking for jbg_dec_init in -ljbig... " >&6; }
if ${ac_cv_lib_jbig_jbg_dec_init+:} false; then :
$as_echo_n "(cached) " >&6
@@ -22956,6 +23053,9 @@ if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then :
LIBS="$LIBS -ljbig"
fi
else
ac_configure_args="$ac_configure_args --disable-jbig"
fi

20
configure.in
View File

@@ -585,6 +585,8 @@ 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)
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)
@@ -2701,12 +2703,22 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
ac_configure_args="$ac_configure_args --disable-jpeg"
fi
dnl If libtiff configure detects lzma library, it enables support for
dnl LZMA compression and using it requires linking with liblzma.
AC_CHECK_LIB(lzma, lzma_code, [LIBS="$LIBS -llzma"])
if test "$wxUSE_LIBLZMA" = "yes"; then
dnl If libtiff configure detects lzma library, it enables support for
dnl LZMA compression and using it requires linking with liblzma.
AC_CHECK_LIB(lzma, lzma_code, [LIBS="$LIBS -llzma"])
else
dnl Prevent libtiff configure from looking for liblzma if it's
dnl explicitly disabled.
ac_configure_args="$ac_configure_args --disable-lzma"
fi
dnl Similarly for jbig
AC_CHECK_LIB(jbig, jbg_dec_init, [LIBS="$LIBS -ljbig"])
if test "$wxUSE_LIBJBIG" = "yes"; then
AC_CHECK_LIB(jbig, jbg_dec_init, [LIBS="$LIBS -ljbig"])
else
ac_configure_args="$ac_configure_args --disable-jbig"
fi
AC_CONFIG_SUBDIRS([src/tiff])
fi