diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-03-07 02:51:18 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-03-07 02:51:18 +0000 |
| commit | d60e57a219eff89b891ff20ee2f72fe1a63b7da2 (patch) | |
| tree | 7b707b8720cfd2f82ce4f6af863d164facc1d1b0 /lib/libarchive/archive_read_support_compression_all.c | |
| parent | de0aeab80c92bfc883421689bda9e9d45a532e29 (diff) | |
| download | FreeBSD-src-d60e57a219eff89b891ff20ee2f72fe1a63b7da2.zip FreeBSD-src-d60e57a219eff89b891ff20ee2f72fe1a63b7da2.tar.gz | |
Merge r585,r669 from libarchive.googlecode.com: If zlib is unavailable,
use external "gunzip" instead. With this in place, we can unconditionally
enable gzip read support.
Diffstat (limited to 'lib/libarchive/archive_read_support_compression_all.c')
| -rw-r--r-- | lib/libarchive/archive_read_support_compression_all.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/libarchive/archive_read_support_compression_all.c b/lib/libarchive/archive_read_support_compression_all.c index 967546d..745f1ff 100644 --- a/lib/libarchive/archive_read_support_compression_all.c +++ b/lib/libarchive/archive_read_support_compression_all.c @@ -36,9 +36,8 @@ archive_read_support_compression_all(struct archive *a) #endif /* The decompress code doesn't use an outside library. */ archive_read_support_compression_compress(a); -#if HAVE_ZLIB_H + /* Gzip decompress falls back to "gunzip" command-line. */ archive_read_support_compression_gzip(a); -#endif #if HAVE_LZMADEC_H /* LZMA bidding is subject to false positives because * the LZMA file format has a very weak signature. It |
