@@ -670,6 +670,8 @@ XML_LIBS

 XML_CPPFLAGS

 ENABLE_UNRAR_FALSE

 ENABLE_UNRAR_TRUE

+HAVE_LIBBZ2_FALSE

+HAVE_LIBBZ2_TRUE

 LIBBZ2_PREFIX

 LTLIBBZ2

 LIBBZ2

@@ -16979,6 +16981,15 @@ $as_echo "$as_me: WARNING: ****** bzip2 support disabled" >&2;}

     fi

 fi

+ if test "x$HAVE_LIBBZ2" = "xyes"; then

+  HAVE_LIBBZ2_TRUE=

+  HAVE_LIBBZ2_FALSE='#'

+else

+  HAVE_LIBBZ2_TRUE='#'

+  HAVE_LIBBZ2_FALSE=

+fi

+

+

 # Check whether --enable-unrar was given.

 if test "${enable_unrar+set}" = set; then :

   enableval=$enable_unrar; want_unrar=$enableval

@@ -21291,6 +21302,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then

   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

 fi

+if test -z "${HAVE_LIBBZ2_TRUE}" && test -z "${HAVE_LIBBZ2_FALSE}"; then

+  as_fn_error $? "conditional \"HAVE_LIBBZ2\" was never defined.

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

+fi

 if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then

   as_fn_error $? "conditional \"ENABLE_UNRAR\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

@@ -23899,6 +23914,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then

   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

 fi

+if test -z "${HAVE_LIBBZ2_TRUE}" && test -z "${HAVE_LIBBZ2_FALSE}"; then

+  as_fn_error $? "conditional \"HAVE_LIBBZ2\" was never defined.

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

+fi

 if test -z "${ENABLE_UNRAR_TRUE}" && test -z "${ENABLE_UNRAR_FALSE}"; then

   as_fn_error $? "conditional \"ENABLE_UNRAR\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

@@ -648,6 +648,8 @@ then

     fi

 fi

+AM_CONDITIONAL([HAVE_LIBBZ2], test "x$HAVE_LIBBZ2" = "xyes")

+

 AC_ARG_ENABLE([unrar],

 [  --disable-unrar	  do not build libclamunrar and libclamunrar_iface ],

 want_unrar=$enableval, want_unrar="yes")

@@ -1,4 +1,4 @@

-# Makefile.in generated by automake 1.11.3 from Makefile.am.

+# Makefile.in generated by automake 1.11.6 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@@ -36,6 +36,23 @@

 VPATH = @srcdir@

+am__make_dryrun = \

+  { \

+    am__dry=no; \

+    case $$MAKEFLAGS in \

+      *\\[\ \	]*) \

+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \

+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \

+      *) \

+        for am__flg in $$MAKEFLAGS; do \

+          case $$am__flg in \

+            *=*|--*) ;; \

+            *n*) am__dry=yes; break;; \

+          esac; \

+        done;; \

+    esac; \

+    test $$am__dry = yes; \

+  }

 pkgdatadir = $(datadir)/@PACKAGE@

 pkgincludedir = $(includedir)/@PACKAGE@

 pkglibdir = $(libdir)/@PACKAGE@

@@ -159,23 +176,23 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \

 	libclamav_la-Ppmd7.lo libclamav_la-Ppmd7Dec.lo \

 	libclamav_la-Xz.lo libclamav_la-XzCrc64.lo \

 	libclamav_la-XzDec.lo libclamav_la-XzIn.lo \

-	libclamav_la-Delta.lo \

-	libclamav_la-BraIA64.lo libclamav_la-CpuArch.lo \

-	libclamav_la-7zCrcOpt.lo libclamav_la-explode.lo \

-	libclamav_la-textnorm.lo libclamav_la-dlp.lo \

-	libclamav_la-js-norm.lo libclamav_la-uniq.lo \

-	libclamav_la-version.lo libclamav_la-mpool.lo \

-	libclamav_la-filtering.lo libclamav_la-fmap.lo \

-	libclamav_la-perflogging.lo libclamav_la-sha256.lo \

-	libclamav_la-sha1.lo libclamav_la-bytecode.lo \

-	libclamav_la-bytecode_vm.lo libclamav_la-cpio.lo \

-	libclamav_la-macho.lo libclamav_la-ishield.lo \

-	libclamav_la-bytecode_api.lo libclamav_la-bytecode_api_decl.lo \

-	libclamav_la-cache.lo libclamav_la-bytecode_detect.lo \

-	libclamav_la-events.lo libclamav_la-adc.lo libclamav_la-dmg.lo \

-	libclamav_la-xar.lo libclamav_la-xz_iface.lo \

-	libclamav_la-sf_base64decode.lo libclamav_la-hfsplus.lo \

-	libclamav_la-swf.lo libclamav_la-jpeg.lo libclamav_la-png.lo \

+	libclamav_la-Delta.lo libclamav_la-BraIA64.lo \

+	libclamav_la-CpuArch.lo libclamav_la-7zCrcOpt.lo \

+	libclamav_la-explode.lo libclamav_la-textnorm.lo \

+	libclamav_la-dlp.lo libclamav_la-js-norm.lo \

+	libclamav_la-uniq.lo libclamav_la-version.lo \

+	libclamav_la-mpool.lo libclamav_la-filtering.lo \

+	libclamav_la-fmap.lo libclamav_la-perflogging.lo \

+	libclamav_la-sha256.lo libclamav_la-sha1.lo \

+	libclamav_la-bytecode.lo libclamav_la-bytecode_vm.lo \

+	libclamav_la-cpio.lo libclamav_la-macho.lo \

+	libclamav_la-ishield.lo libclamav_la-bytecode_api.lo \

+	libclamav_la-bytecode_api_decl.lo libclamav_la-cache.lo \

+	libclamav_la-bytecode_detect.lo libclamav_la-events.lo \

+	libclamav_la-adc.lo libclamav_la-dmg.lo libclamav_la-xar.lo \

+	libclamav_la-xz_iface.lo libclamav_la-sf_base64decode.lo \

+	libclamav_la-hfsplus.lo libclamav_la-swf.lo \

+	libclamav_la-jpeg.lo libclamav_la-png.lo \

 	libclamav_la-iso9660.lo libclamav_la-arc4.lo \

 	libclamav_la-rijndael.lo libclamav_la-crtmgr.lo \

 	libclamav_la-asn1.lo libclamav_la-fp_add.lo \

@@ -351,6 +368,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

 	install-pdf-recursive install-ps-recursive install-recursive \

 	installcheck-recursive installdirs-recursive pdf-recursive \

 	ps-recursive uninstall-recursive

+am__can_run_installinfo = \

+  case $$AM_UPDATE_INFO_DIR in \

+    n|no|NO) false;; \

+    *) (install-info --version) >/dev/null 2>&1;; \

+  esac

 HEADERS = $(include_HEADERS)

 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\

   distclean-recursive maintainer-clean-recursive

@@ -684,16 +706,16 @@ libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \

 	7z/Bra.c 7z/Bra.h 7z/Bra86.c 7z/CpuArch.h 7z/Lzma2Dec.c \

 	7z/Lzma2Dec.h 7z/LzmaDec.c 7z/LzmaDec.h 7z/Ppmd.h 7z/Ppmd7.c \

 	7z/Ppmd7.h 7z/Ppmd7Dec.c 7z/Types.h 7z/Xz.c 7z/Xz.h \

-	7z/XzCrc64.c 7z/XzCrc64.h 7z/XzDec.c 7z/XzIn.c  \

-	7z/Sha256.h 7z/Delta.c 7z/Delta.h 7z/Alloc.h 7z/BraIA64.c \

-	7z/CpuArch.c 7z/CpuArch.h 7z/7zCrcOpt.c 7z/RotateDefs.h \

-	explode.c explode.h textnorm.c textnorm.h dlp.c dlp.h \

-	jsparse/js-norm.c jsparse/js-norm.h jsparse/lexglobal.h \

-	jsparse/textbuf.h uniq.c uniq.h version.c version.h mpool.c \

-	mpool.h filtering.h filtering.c fmap.c fmap.h perflogging.c \

-	perflogging.h default.h sha256.c sha256.h sha1.c sha1.h \

-	bytecode.c bytecode.h bytecode_vm.c bytecode_priv.h clambc.h \

-	cpio.c cpio.h macho.c macho.h ishield.c ishield.h type_desc.h \

+	7z/XzCrc64.c 7z/XzCrc64.h 7z/XzDec.c 7z/XzIn.c 7z/Sha256.h \

+	7z/Delta.c 7z/Delta.h 7z/Alloc.h 7z/BraIA64.c 7z/CpuArch.c \

+	7z/CpuArch.h 7z/7zCrcOpt.c 7z/RotateDefs.h explode.c explode.h \

+	textnorm.c textnorm.h dlp.c dlp.h jsparse/js-norm.c \

+	jsparse/js-norm.h jsparse/lexglobal.h jsparse/textbuf.h uniq.c \

+	uniq.h version.c version.h mpool.c mpool.h filtering.h \

+	filtering.c fmap.c fmap.h perflogging.c perflogging.h \

+	default.h sha256.c sha256.h sha1.c sha1.h bytecode.c \

+	bytecode.h bytecode_vm.c bytecode_priv.h clambc.h cpio.c \

+	cpio.h macho.c macho.h ishield.c ishield.h type_desc.h \

 	bcfeatures.h bytecode_api.c bytecode_api_decl.c bytecode_api.h \

 	bytecode_api_impl.h bytecode_hooks.h cache.c cache.h \

 	bytecode_detect.c bytecode_detect.h builtin_bytecodes.h \

@@ -808,7 +830,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

 $(am__aclocal_m4_deps):

 install-libLTLIBRARIES: $(lib_LTLIBRARIES)

 	@$(NORMAL_INSTALL)

-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"

 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \

 	list2=; for p in $$list; do \

 	  if test -f $$p; then \

@@ -816,6 +837,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES)

 	  else :; fi; \

 	done; \

 	test -z "$$list2" || { \

+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \

+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \

 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \

 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \

 	}

@@ -2775,8 +2798,11 @@ clean-libtool:

 	-rm -rf .libs _libs

 install-includeHEADERS: $(include_HEADERS)

 	@$(NORMAL_INSTALL)

-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"

 	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \

+	if test -n "$$list"; then \

+	  echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \

+	  $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \

+	fi; \

 	for p in $$list; do \

 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

 	  echo "$$d$$p"; \

@@ -2959,13 +2985,10 @@ distdir: $(DISTFILES)

 	done

 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

 	  if test "$$subdir" = .; then :; else \

-	    test -d "$(distdir)/$$subdir" \

-	    || $(MKDIR_P) "$(distdir)/$$subdir" \

-	    || exit 1; \

-	  fi; \

-	done

-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

-	  if test "$$subdir" = .; then :; else \

+	    $(am__make_dryrun) \

+	      || test -d "$(distdir)/$$subdir" \

+	      || $(MKDIR_P) "$(distdir)/$$subdir" \

+	      || exit 1; \

 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \

 	    $(am__relativize); \

 	    new_distdir=$$reldir; \

@@ -1,14 +1,18 @@

-FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe.bz2 clam.exe clam.zip \

+FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe clam.zip \

 	clam.arj clam.exe.rtf clam.exe.szdd clam.tar.gz clam.chm clam.sis \

 	clam-aspack.exe clam-pespin.exe clam-upx.exe clam-fsg.exe clam-mew.exe\

 	clam-nsis.exe clam-petite.exe clam-upack.exe clam-wwpack.exe clam.pdf\

 	clam.mail clam.ppt clam.tnef clam.ea05.exe clam.ea06.exe clam.d64.zip\

 	clam.exe.mbox.base64 clam.exe.mbox.uu clam.exe.binhex clam.ole.doc \

-	clam.impl.zip clam.exe.html clam.bz2.zip clam.bin-be.cpio clam.bin-le.cpio \

+	clam.impl.zip clam.exe.html clam.bin-be.cpio clam.bin-le.cpio \

 	clam.newc.cpio clam.odc.cpio clam-yc.exe clam_IScab_int.exe \

 	clam_IScab_ext.exe clam_ISmsi_int.exe clam_ISmsi_ext.exe clam.7z \

 	clam_cache_emax.tgz clam.iso clamjol.iso

+if HAVE_LIBBZ2

+FILES += clam.exe.bz2 clam.bz2.zip

+endif

+

 SPLIT_DIR=$(top_srcdir)/test/.split

 all: $(FILES)

@@ -51,6 +51,7 @@ POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

 target_triplet = @target@

+@HAVE_LIBBZ2_TRUE@am__append_1 = clam.exe.bz2 clam.bz2.zip

 subdir = test

 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

@@ -252,17 +253,18 @@ target_vendor = @target_vendor@

 top_build_prefix = @top_build_prefix@

 top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

-FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe.bz2 clam.exe clam.zip \

-	clam.arj clam.exe.rtf clam.exe.szdd clam.tar.gz clam.chm clam.sis \

-	clam-aspack.exe clam-pespin.exe clam-upx.exe clam-fsg.exe clam-mew.exe\

-	clam-nsis.exe clam-petite.exe clam-upack.exe clam-wwpack.exe clam.pdf\

-	clam.mail clam.ppt clam.tnef clam.ea05.exe clam.ea06.exe clam.d64.zip\

-	clam.exe.mbox.base64 clam.exe.mbox.uu clam.exe.binhex clam.ole.doc \

-	clam.impl.zip clam.exe.html clam.bz2.zip clam.bin-be.cpio clam.bin-le.cpio \

-	clam.newc.cpio clam.odc.cpio clam-yc.exe clam_IScab_int.exe \

-	clam_IScab_ext.exe clam_ISmsi_int.exe clam_ISmsi_ext.exe clam.7z \

-	clam_cache_emax.tgz clam.iso clamjol.iso

-

+FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe clam.zip clam.arj \

+	clam.exe.rtf clam.exe.szdd clam.tar.gz clam.chm clam.sis \

+	clam-aspack.exe clam-pespin.exe clam-upx.exe clam-fsg.exe \

+	clam-mew.exe clam-nsis.exe clam-petite.exe clam-upack.exe \

+	clam-wwpack.exe clam.pdf clam.mail clam.ppt clam.tnef \

+	clam.ea05.exe clam.ea06.exe clam.d64.zip clam.exe.mbox.base64 \

+	clam.exe.mbox.uu clam.exe.binhex clam.ole.doc clam.impl.zip \

+	clam.exe.html clam.bin-be.cpio clam.bin-le.cpio clam.newc.cpio \

+	clam.odc.cpio clam-yc.exe clam_IScab_int.exe \

+	clam_IScab_ext.exe clam_ISmsi_int.exe clam_ISmsi_ext.exe \

+	clam.7z clam_cache_emax.tgz clam.iso clamjol.iso \

+	$(am__append_1)

 SPLIT_DIR = $(top_srcdir)/test/.split

 EXTRA_DIST = .split

 all: all-am

@@ -354,7 +354,12 @@ END_TEST

 static char **testfiles = NULL;

 static unsigned testfiles_n = 0;

+

+#if HAVE_LIBBZ2

 static const int expected_testfiles = 48;

+#else

+static const int expected_testfiles = 46;

+#endif

 static void init_testfiles(void)

 {