@@ -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")

@@ -83,9 +83,9 @@ target_triplet = @target@

 subdir = .

 DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \

 	$(srcdir)/Makefile.in $(srcdir)/clamavcxx-config.h.in \

-	$(top_srcdir)/configure config/ar-lib config/compile \

-	config/config.guess config/config.sub config/depcomp \

-	config/install-sh config/ltmain.sh config/missing

+	$(top_srcdir)/configure config/config.guess config/config.sub \

+	config/depcomp config/install-sh config/ltmain.sh \

+	config/missing

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/m4/check_gnu_make.m4 \

 	$(top_srcdir)/m4/cxx_flag_check.m4 $(top_srcdir)/m4/libtool.m4 \

@@ -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)

 {