diff --git a/configure b/configure
index d318887..c89bdf0 100755
--- a/configure
+++ b/configure
@@ -749,6 +749,9 @@
OPENEXR_DELEGATE_TRUE
OPENEXR_LIBS
OPENEXR_CFLAGS
+LZMA_LIBS
+LZMA_DELEGATE_FALSE
+LZMA_DELEGATE_TRUE
LQR_DELEGATE_FALSE
LQR_DELEGATE_TRUE
LQR_LIBS
@@ -1112,6 +1115,7 @@
with_lcms
with_lcms2
with_lqr
+with_lzma
with_openexr
with_png
with_rsvg
@@ -1858,6 +1862,7 @@
--without-lcms disable lcms (v1.1X) support
--without-lcms2 disable lcms (v2.X) support
--without-lqr disable Liquid Rescale support
+ --without-lzma disable LZMA support
--without-openexr disable OpenEXR support
--without-png disable PNG support
--without-rsvg disable RSVG support
@@ -19982,7 +19987,7 @@
fi
# Enable build using delegate libraries built in subdirectories rather than installed
-# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms png tiff ttf wmf xml zlib)
+# delegate libraries (bzlib fftw fpx gslib jp2 jbig jpeg lcms lzma png tiff ttf wmf xml zlib)
# Check whether --enable-delegate-build was given.
if test "${enable_delegate_build+set}" = set; then :
enableval=$enable_delegate_build; enable_delegate_build=$enableval
@@ -24047,7 +24052,7 @@
# Most delegates have includes in the same directory as the library, but not all...
#
# Includes
- for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
+ for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper/include jbig/libjbig jpeg lcms/include lzma magick png tiff/libtiff ttf/include wand wmf/include xml/include zlib; do
if test -d "$builddir/$dir"; then
CPPFLAGS="$CPPFLAGS -I$builddir/$dir"
else
@@ -24058,7 +24063,7 @@
done
# Libraries
- for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
+ for dir in bzlib fftw fpx gslib/src jp2 jp2/src/libjasper jbig/libjbig jpeg lcms/src lzma magick png tiff/libtiff ttf/objs wand wmf/src xml zlib; do
if test -d "$builddir/$dir/.libs"; then
LDFLAGS="$LDFLAGS -L$builddir/$dir/.libs"
else
@@ -28228,6 +28233,116 @@
+# Disable LZMA (lzma library)
+
+# Check whether --with-lzma was given.
+if test "${with_lzma+set}" = set; then :
+ withval=$with_lzma; with_lzma=$withval
+else
+ with_lzma='yes'
+fi
+
+if test "$with_lzma" != 'yes' ; then
+ DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-lzma=$with_lzma "
+fi
+
+#
+# Check for LZMA
+#
+have_lzma='no'
+LZMA_LIBS=''
+if test "$with_lzma" != 'no' || test "$with_tiff" != 'no'; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
+$as_echo "-------------------------------------------------------------" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZMA" >&5
+$as_echo_n "checking for LZMA... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+$as_echo "" >&6; }
+ failed=0
+ passed=0
+ ac_fn_c_check_header_mongrel "$LINENO" "lzma.h" "ac_cv_header_lzma_h" "$ac_includes_default"
+if test "x$ac_cv_header_lzma_h" = x""yes; then :
+ passed=`expr $passed + 1`
+else
+ failed=`expr $failed + 1`
+fi
+
+
+ { $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 test "${ac_cv_lib_lzma_lzma_code+set}" = set; 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" = x""yes; then :
+ passed=`expr $passed + 1`
+else
+ failed=`expr $failed + 1`
+fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if LZMA package is complete" >&5
+$as_echo_n "checking if LZMA package is complete... " >&6; }
+ if test $passed -gt 0; then
+ if test $failed -gt 0; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5
+$as_echo "no -- some components failed test" >&6; }
+ have_lzma='no (failed tests)'
+ else
+ LZMA_LIBS='-llzma'
+ LIBS="$LZMA_LIBS $LIBS"
+
+$as_echo "#define LZMA_DELEGATE 1" >>confdefs.h
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_lzma='yes'
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+fi
+ if test "$have_lzma" = 'yes'; then
+ LZMA_DELEGATE_TRUE=
+ LZMA_DELEGATE_FALSE='#'
+else
+ LZMA_DELEGATE_TRUE='#'
+ LZMA_DELEGATE_FALSE=
+fi
+
+
+
+
#
# Check for the OpenEXR delegate library.
#
@@ -32366,6 +32481,7 @@
if test "$have_lcms2" = 'yes'; then DELEGATES="$DELEGATES lcms2"; fi
if test "$have_lcms" = 'yes'; then DELEGATES="$DELEGATES lcms"; fi
if test "$have_lqr" = 'yes'; then DELEGATES="$DELEGATES lqr"; fi
+if test "$have_lzma" = 'yes'; then DELEGATES="$DELEGATES lzma"; fi
if test "$have_ffmpeg" = 'yes'; then DELEGATES="$DELEGATES mpeg"; fi
if test "$have_openexr" = 'yes'; then DELEGATES="$DELEGATES openexr"; fi
if test "$have_png" = 'yes'; then DELEGATES="$DELEGATES png"; fi
@@ -32522,9 +32638,9 @@
if test "$with_modules" != 'no'; then
- MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
else
- MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
+ MAGICK_DEP_LIBS="$JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JP2_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $CCMALLOC_LIBS $EFENCE_LIBS $UMEM_LIBS $GOMP_LIBS $CL_LIBS $THREAD_LIBS"
fi
@@ -32852,6 +32968,10 @@
as_fn_error $? "conditional \"LQR_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${LZMA_DELEGATE_TRUE}" && test -z "${LZMA_DELEGATE_FALSE}"; then
+ as_fn_error $? "conditional \"LZMA_DELEGATE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${OPENEXR_DELEGATE_TRUE}" && test -z "${OPENEXR_DELEGATE_FALSE}"; then
as_fn_error $? "conditional \"OPENEXR_DELEGATE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -35611,6 +35731,7 @@
LCMS v1 --with-lcms=$with_lcms $have_lcms
LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2
LQR --with-lqr=$with_lqr $have_lqr
+LZMA --with-lzma=$with_lzma $have_lzma
Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus
OpenEXR --with-openexr=$with_openexr $have_openexr
PERL --with-perl=$with_perl $have_perl
@@ -35684,6 +35805,7 @@
LCMS v1 --with-lcms=$with_lcms $have_lcms
LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2
LQR --with-lqr=$with_lqr $have_lqr
+LZMA --with-lzma=$with_lzma $have_lzma
Magick++ --with-magick-plus-plus=$with_magick_plus_plus $have_magick_plus_plus
OpenEXR --with-openexr=$with_openexr $have_openexr
PERL --with-perl=$with_perl $have_perl