diff options
| author | joerg <joerg@pkgsrc.org> | 2016-06-22 21:04:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-06-22 21:04:54 +0000 |
| commit | 995f3d3a9623b2ad8fe9792534cac91af0b1da1f (patch) | |
| tree | 167ecd9d39d60844a0eb831ff8391489c75e83ea /archivers | |
| parent | 6c5b9599ad1cdc586dcad67944b554265123eb6b (diff) | |
| download | pkgsrc-995f3d3a9623b2ad8fe9792534cac91af0b1da1f.tar.gz | |
Restore fix for lzma_stream_encoder_mt detection. Lost while syncing
with upstream.
Diffstat (limited to 'archivers')
| -rwxr-xr-x | archivers/libarchive/files/configure | 8 | ||||
| -rw-r--r-- | archivers/libarchive/files/configure.ac | 7 |
2 files changed, 11 insertions, 4 deletions
diff --git a/archivers/libarchive/files/configure b/archivers/libarchive/files/configure index bb491e66d37..c07e05b468f 100755 --- a/archivers/libarchive/files/configure +++ b/archivers/libarchive/files/configure @@ -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; } diff --git a/archivers/libarchive/files/configure.ac b/archivers/libarchive/files/configure.ac index 64775fa6382..4f7f432ab2d 100644 --- a/archivers/libarchive/files/configure.ac +++ b/archivers/libarchive/files/configure.ac @@ -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 |