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

Ensure jbig support is disabled for builtin libtiff

Browse Source
This commit is contained in:
Ian McInerney
2020-06-17 23:14:01 +01:00
parent 10a958562d
commit b7600b0b1b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@@ -21885,8 +21885,6 @@ if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then :
JBIG_LINK=" -ljbig" JBIG_LINK=" -ljbig"
fi fi
else
ac_configure_args="$ac_configure_args --disable-jbig"
fi fi
@@ -22123,6 +22121,7 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst
if test "$wxUSE_LIBJPEG" = "no"; then if test "$wxUSE_LIBJPEG" = "no"; then
ac_configure_args="$ac_configure_args --disable-jpeg" ac_configure_args="$ac_configure_args --disable-jpeg"
fi fi
ac_configure_args="$ac_configure_args --disable-jbig"
subdirs="$subdirs src/tiff" subdirs="$subdirs src/tiff"

5
configure.in
View File

@@ -2629,8 +2629,6 @@ dnl ------------------------------------------------------------------------
JBIG_LINK= JBIG_LINK=
if test "$wxUSE_LIBJBIG" = "yes"; then if test "$wxUSE_LIBJBIG" = "yes"; then
AC_CHECK_LIB(jbig, jbg_dec_init, JBIG_LINK=" -ljbig") AC_CHECK_LIB(jbig, jbg_dec_init, JBIG_LINK=" -ljbig")
else
ac_configure_args="$ac_configure_args --disable-jbig"
fi fi
dnl ------------------------------------------------------------------------ dnl ------------------------------------------------------------------------
@@ -2710,6 +2708,9 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
dnl we need to hack around this dnl we need to hack around this
ac_configure_args="$ac_configure_args --disable-jpeg" ac_configure_args="$ac_configure_args --disable-jpeg"
fi 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]) AC_CONFIG_SUBDIRS([src/tiff])
fi fi
fi fi