Merge r340 from libarchive.googlecode.com: If zlib/bzlib aren't available,

we can still detect gzip/bzip2 compressed streams, we just can't
decompress them.

1 files changed, 10 insertions, 3 deletions

diff --git a/lib/libarchive/archive_write_set_compression_bzip2.c b/lib/libarchive/archive_write_set_compression_bzip2.c
index 1f59fca..592c526 100644
--- a/lib/libarchive/archive_write_set_compression_bzip2.c
+++ b/lib/libarchive/archive_write_set_compression_bzip2.c
@@ -25,9 +25,6 @@
 
 #include "archive_platform.h"
 
-/* Don't compile this if we don't have bzlib. */
-#if HAVE_BZLIB_H
-
 __FBSDID("$FreeBSD$");
 
 #ifdef HAVE_ERRNO_H
@@ -48,6 +45,16 @@ __FBSDID("$FreeBSD$");
 #include "archive_private.h"
 #include "archive_write_private.h"
 
+#ifndef HAVE_BZLIB_H
+int
+archive_write_set_compression_bzip2(struct archive *_a)
+{
+	/* Unsupported bzip2 compression, we don't have bzlib */
+	return (ARCHIVE_FATAL);
+}
+#else
+/* Don't compile this if we don't have bzlib. */
+
 struct private_data {
 	bz_stream	 stream;
 	int64_t		 total_in;