Link with liblzma when using built-in libtiff if it's available.

New version of libtiff includes code using liblzma if it's available, so we
need to link with it in this case.

Closes #14963.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74033 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index ed244820a4ec8c9b99f516ea3c194ab219d23ac8..48cf932fd3a40f2fa6614fe9eb911d7598c7827e 100755 (executable)
--- a/configure
+++ b/configure
@@ -22875,6 +22875,48 @@ $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
+$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
+
+
+
 
 subdirs="$subdirs src/tiff"
 

diff --git a/configure.in b/configure.in
index e00e614b72f3f397e667d3697d5562d92c5b9a01..e59926b81b0623f932e3b284987f2823d4fff124 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2700,6 +2700,11 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
             dnl we need to hack around this
             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"])
+
         AC_CONFIG_SUBDIRS([src/tiff])
     fi
 fi