From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Wed, 15 Feb 2012 19:27:43 +0000 (+0900)
Subject: Fix issue 242:libarchive-3.0.3 fails to build with --without-zlib
X-Git-Tag: v3.0.4~2^2~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3647371f9d87dc23d7926a27da5abad0067ed22d;p=thirdparty%2Flibarchive.git

Fix issue 242:libarchive-3.0.3 fails to build with --without-zlib
---

diff --git a/libarchive/archive_write_set_format_7zip.c b/libarchive/archive_write_set_format_7zip.c
index cbf14a79a..80b8581ae 100644
--- a/libarchive/archive_write_set_format_7zip.c
+++ b/libarchive/archive_write_set_format_7zip.c
@@ -1590,7 +1590,8 @@ file_init_register_empty(struct _7zip *zip)
 	zip->empty_list.last = &(zip->empty_list.first);
 }
 
-#if !defined(HAVE_BZLIB_H) || !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H)
+#if !defined(HAVE_ZLIB_H) || !defined(HAVE_BZLIB_H) ||\
+	 !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H)
 static int
 compression_unsupported_encoder(struct archive *a,
     struct la_zstream *lastrm, const char *name)