Check for lzma and jbig when using system libtiff
Currently lzma and jbig libraries are checked only for builtin libtiff. When the system libtiff is built with lzma and jbig support and when the `--with-libtiff=sys` flag is specified the configure script will fail, due to missing linking with lzma and jbig. Fixed this by moving lzma and jbig checks from libtiff-builin check above all libtiff checks. Also added lzma and jbig libs to EXTRALIBS_GUI. See https://github.com/wxWidgets/wxWidgets/pull/619
This commit is contained in:
Pavel O
VZ
193
configure
vendored
193
configure
vendored
@@ -20624,6 +20624,100 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
LZMA_LINK=
|
||||
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
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-llzma $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char lzma_code ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return lzma_code ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_lzma_lzma_code=yes
|
||||
else
|
||||
ac_cv_lib_lzma_lzma_code=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5
|
||||
$as_echo "$ac_cv_lib_lzma_lzma_code" >&6; }
|
||||
if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then :
|
||||
LZMA_LINK=" -llzma"
|
||||
fi
|
||||
|
||||
else
|
||||
ac_configure_args="$ac_configure_args --disable-lzma"
|
||||
fi
|
||||
|
||||
|
||||
JBIG_LINK=
|
||||
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
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ljbig $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char jbg_dec_init ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return jbg_dec_init ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_jbig_jbg_dec_init=yes
|
||||
else
|
||||
ac_cv_lib_jbig_jbg_dec_init=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5
|
||||
$as_echo "$ac_cv_lib_jbig_jbg_dec_init" >&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
|
||||
|
||||
|
||||
TIFF_LINK=
|
||||
TIFF_PREREQ_LINKS=-lm
|
||||
if test "$wxUSE_LIBTIFF" != "no" ; then
|
||||
@@ -20637,6 +20731,12 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
|
||||
if test "$wxUSE_ZLIB" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
|
||||
fi
|
||||
if test "$wxUSE_LIBLZMA" = "yes"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK"
|
||||
fi
|
||||
if test "$wxUSE_LIBJBIG" = "yes"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK"
|
||||
fi
|
||||
ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "
|
||||
|
||||
"
|
||||
@@ -20704,97 +20804,6 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst
|
||||
ac_configure_args="$ac_configure_args --disable-jpeg"
|
||||
fi
|
||||
|
||||
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
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-llzma $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char lzma_code ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return lzma_code ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_lzma_lzma_code=yes
|
||||
else
|
||||
ac_cv_lib_lzma_lzma_code=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5
|
||||
$as_echo "$ac_cv_lib_lzma_lzma_code" >&6; }
|
||||
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
|
||||
|
||||
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
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
LIBS="-ljbig $LIBS"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
/* Override any GCC internal prototype to avoid an error.
|
||||
Use char because int might match the return type of a GCC
|
||||
builtin and then its argument prototype would still apply. */
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
char jbg_dec_init ();
|
||||
int
|
||||
main ()
|
||||
{
|
||||
return jbg_dec_init ();
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
ac_cv_lib_jbig_jbg_dec_init=yes
|
||||
else
|
||||
ac_cv_lib_jbig_jbg_dec_init=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
LIBS=$ac_check_lib_save_LIBS
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5
|
||||
$as_echo "$ac_cv_lib_jbig_jbg_dec_init" >&6; }
|
||||
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
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs src/tiff"
|
||||
|
||||
@@ -35883,7 +35892,7 @@ EXTRALIBS_HTML="$MSPACK_LINK"
|
||||
EXTRALIBS_MEDIA="$GST_LIBS"
|
||||
EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK`
|
||||
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LZMA_LINK $JBIG_LINK $WEBKIT_LINK`
|
||||
fi
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
|
||||
|
||||
48
configure.in
48
configure.in
@@ -2537,6 +2537,28 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ------------------------------------------------------------------------
|
||||
dnl Check for lzma library
|
||||
dnl ------------------------------------------------------------------------
|
||||
|
||||
LZMA_LINK=
|
||||
if test "$wxUSE_LIBLZMA" = "yes"; then
|
||||
AC_CHECK_LIB(lzma, lzma_code, LZMA_LINK=" -llzma")
|
||||
else
|
||||
ac_configure_args="$ac_configure_args --disable-lzma"
|
||||
fi
|
||||
|
||||
dnl ------------------------------------------------------------------------
|
||||
dnl Check for jbig library
|
||||
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 ------------------------------------------------------------------------
|
||||
dnl Check for tiff library
|
||||
dnl ------------------------------------------------------------------------
|
||||
@@ -2555,6 +2577,12 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
|
||||
if test "$wxUSE_ZLIB" = "sys"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
|
||||
fi
|
||||
if test "$wxUSE_LIBLZMA" = "yes"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $LZMA_LINK"
|
||||
fi
|
||||
if test "$wxUSE_LIBJBIG" = "yes"; then
|
||||
TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JBIG_LINK"
|
||||
fi
|
||||
AC_CHECK_HEADER(tiffio.h,
|
||||
[
|
||||
AC_CHECK_LIB(tiff, TIFFError,
|
||||
@@ -2588,24 +2616,6 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
|
||||
dnl we need to hack around this
|
||||
ac_configure_args="$ac_configure_args --disable-jpeg"
|
||||
fi
|
||||
|
||||
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
|
||||
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
|
||||
fi
|
||||
@@ -7807,7 +7817,7 @@ EXTRALIBS_HTML="$MSPACK_LINK"
|
||||
EXTRALIBS_MEDIA="$GST_LIBS"
|
||||
EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
|
||||
if test "$wxUSE_GUI" = "yes"; then
|
||||
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK`
|
||||
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LZMA_LINK $JBIG_LINK $WEBKIT_LINK`
|
||||
fi
|
||||
if test "$wxUSE_OPENGL" = "yes"; then
|
||||
EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
|
||||
|
||||
Reference in New Issue
Block a user