[pkgsrc/trunk]: pkgsrc/archivers/libarchive/files Restore fix for lzma_stream...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3757284c5389
branches:  trunk
changeset: 349005:3757284c5389
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jun 22 21:04:54 2016 +0000

description:
Restore fix for lzma_stream_encoder_mt detection. Lost while syncing
with upstream.

diffstat:

 archivers/libarchive/files/configure    |  8 ++++++--
 archivers/libarchive/files/configure.ac |  7 +++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 9ea332e5b70f -r 3757284c5389 archivers/libarchive/files/configure
--- a/archivers/libarchive/files/configure      Wed Jun 22 15:40:46 2016 +0000
+++ b/archivers/libarchive/files/configure      Wed Jun 22 21:04:54 2016 +0000
@@ -14748,6 +14748,9 @@
 /* end confdefs.h.  */
 
       #include <lzma.h>
+                       #if LZMA_VERSION < 50020000
+                       #error unsupported
+                       #endif
 int
 main ()
 {
@@ -14756,12 +14759,13 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lzma_has_mt=yes
 else
   ac_cv_lzma_has_mt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lzma_has_mt" >&5
 $as_echo "$ac_cv_lzma_has_mt" >&6; }
diff -r 9ea332e5b70f -r 3757284c5389 archivers/libarchive/files/configure.ac
--- a/archivers/libarchive/files/configure.ac   Wed Jun 22 15:40:46 2016 +0000
+++ b/archivers/libarchive/files/configure.ac   Wed Jun 22 21:04:54 2016 +0000
@@ -374,8 +374,11 @@
   AC_CACHE_CHECK(
     [whether we have multithread support in lzma],
     ac_cv_lzma_has_mt,
-    [AC_COMPILE_IFELSE([
-      AC_LANG_PROGRAM([[#include <lzma.h>]],
+    [AC_LINK_IFELSE([
+      AC_LANG_PROGRAM([[#include <lzma.h>]
+                       [#if LZMA_VERSION < 50020000]
+                       [#error unsupported]
+                       [#endif]],
                       [[lzma_stream_encoder_mt(0, 0);]])],
       [ac_cv_lzma_has_mt=yes], [ac_cv_lzma_has_mt=no])])
   if test "x$ac_cv_lzma_has_mt" != xno; then