CVS commit: pkgsrc/archivers/libarchive/files

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Jun 22 21:04:54 UTC 2016

Modified Files:
        pkgsrc/archivers/libarchive/files: configure configure.ac

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


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/archivers/libarchive/files/configure \
    pkgsrc/archivers/libarchive/files/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/archivers/libarchive/files/configure
diff -u pkgsrc/archivers/libarchive/files/configure:1.11 pkgsrc/archivers/libarchive/files/configure:1.12
--- pkgsrc/archivers/libarchive/files/configure:1.11    Tue Jun 21 13:39:21 2016
+++ pkgsrc/archivers/libarchive/files/configure Wed Jun 22 21:04:54 2016
@@ -14748,6 +14748,9 @@ else
 /* end confdefs.h.  */
 
       #include <lzma.h>
+                       #if LZMA_VERSION < 50020000
+                       #error unsupported
+                       #endif
 int
 main ()
 {
@@ -14756,12 +14759,13 @@ lzma_stream_encoder_mt(0, 0);
   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; }
Index: pkgsrc/archivers/libarchive/files/configure.ac
diff -u pkgsrc/archivers/libarchive/files/configure.ac:1.11 pkgsrc/archivers/libarchive/files/configure.ac:1.12
--- pkgsrc/archivers/libarchive/files/configure.ac:1.11 Tue Jun 21 13:39:21 2016
+++ pkgsrc/archivers/libarchive/files/configure.ac      Wed Jun 22 21:04:54 2016
@@ -374,8 +374,11 @@ if test "x$with_lzma" != "xno"; then
   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