@@ -153,6 +153,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -441,6 +442,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -127,6 +127,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -395,6 +396,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -331,6 +332,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -126,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -349,6 +350,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -129,6 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -406,6 +407,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -126,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -360,6 +361,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -108,6 +108,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -366,6 +367,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -127,6 +127,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -351,6 +352,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -126,6 +126,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -349,6 +350,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -729,6 +729,10 @@ LIBBZ2

 MAINT

 MAINTAINER_MODE_FALSE

 MAINTAINER_MODE_TRUE

+LIBMSPACK_LIBS

+LIBMSPACK_CFLAGS

+USE_INTERNAL_MSPACK_FALSE

+USE_INTERNAL_MSPACK_TRUE

 pcreconfig

 HAVE_LIBXML2_FALSE

 HAVE_LIBXML2_TRUE

@@ -930,6 +934,7 @@ with_xml

 with_openssl

 with_libjson

 with_pcre

+with_system_libmspack

 enable_maintainer_mode

 with_zlib

 enable_zlib_vcheck

@@ -993,6 +998,8 @@ YACC

 YFLAGS

 CHECK_CFLAGS

 CHECK_LIBS

+LIBMSPACK_CFLAGS

+LIBMSPACK_LIBS

 SYSTEMD_CFLAGS

 SYSTEMD_LIBS'

 ac_subdirs_all='

@@ -1697,6 +1704,9 @@ Optional Packages:

   --with-pcre[=DIR]       path to directory containing libpcre library,

                           prioritizes PCRE2 over PCRE [default=search PATH

                           environment variable]

+  --with-system-libmspack Specify system libmspack location or to use internal

+                          package, uses full path to libmspack or bin

+                          directory (default=search PATH environment variable)

   --with-zlib[=DIR]       path to directory containing zlib library

                           [default=/usr/local or /usr if not found in

                           /usr/local]

@@ -1752,6 +1762,10 @@ Some influential environment variables:

   CHECK_CFLAGS

               C compiler flags for CHECK, overriding pkg-config

   CHECK_LIBS  linker flags for CHECK, overriding pkg-config

+  LIBMSPACK_CFLAGS

+              C compiler flags for LIBMSPACK, overriding pkg-config

+  LIBMSPACK_LIBS

+              linker flags for LIBMSPACK, overriding pkg-config

   SYSTEMD_CFLAGS

               C compiler flags for SYSTEMD, overriding pkg-config

   SYSTEMD_LIBS

@@ -22739,6 +22753,111 @@ fi

+# Check whether --with-system-libmspack was given.

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

+  withval=$with_system_libmspack; system_libmspack=$withval

+else

+  system_libmspack="no"

+fi

+

+

+if test "x$system_libmspack" = "xno"; then

+    use_internal_mspack=yes

+     if test TRUE; then

+  USE_INTERNAL_MSPACK_TRUE=

+  USE_INTERNAL_MSPACK_FALSE='#'

+else

+  USE_INTERNAL_MSPACK_TRUE='#'

+  USE_INTERNAL_MSPACK_FALSE=

+fi

+

+else

+

+pkg_failed=no

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMSPACK" >&5

+$as_echo_n "checking for LIBMSPACK... " >&6; }

+

+if test -n "$LIBMSPACK_CFLAGS"; then

+    pkg_cv_LIBMSPACK_CFLAGS="$LIBMSPACK_CFLAGS"

+ elif test -n "$PKG_CONFIG"; then

+    if test -n "$PKG_CONFIG" && \

+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmspack\""; } >&5

+  ($PKG_CONFIG --exists --print-errors "libmspack") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; }; then

+  pkg_cv_LIBMSPACK_CFLAGS=`$PKG_CONFIG --cflags "libmspack" 2>/dev/null`

+		      test "x$?" != "x0" && pkg_failed=yes

+else

+  pkg_failed=yes

+fi

+ else

+    pkg_failed=untried

+fi

+if test -n "$LIBMSPACK_LIBS"; then

+    pkg_cv_LIBMSPACK_LIBS="$LIBMSPACK_LIBS"

+ elif test -n "$PKG_CONFIG"; then

+    if test -n "$PKG_CONFIG" && \

+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmspack\""; } >&5

+  ($PKG_CONFIG --exists --print-errors "libmspack") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; }; then

+  pkg_cv_LIBMSPACK_LIBS=`$PKG_CONFIG --libs "libmspack" 2>/dev/null`

+		      test "x$?" != "x0" && pkg_failed=yes

+else

+  pkg_failed=yes

+fi

+ else

+    pkg_failed=untried

+fi

+

+

+

+if test $pkg_failed = yes; then

+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+

+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

+        _pkg_short_errors_supported=yes

+else

+        _pkg_short_errors_supported=no

+fi

+        if test $_pkg_short_errors_supported = yes; then

+	        LIBMSPACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmspack" 2>&1`

+        else

+	        LIBMSPACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmspack" 2>&1`

+        fi

+	# Put the nasty error message in config.log where it belongs

+	echo "$LIBMSPACK_PKG_ERRORS" >&5

+

+	use_internal_mspack=yes

+elif test $pkg_failed = untried; then

+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+	use_internal_mspack=yes

+else

+	LIBMSPACK_CFLAGS=$pkg_cv_LIBMSPACK_CFLAGS

+	LIBMSPACK_LIBS=$pkg_cv_LIBMSPACK_LIBS

+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

+$as_echo "yes" >&6; }

+	use_internal_mspack=no

+fi

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

+  USE_INTERNAL_MSPACK_TRUE=

+  USE_INTERNAL_MSPACK_FALSE='#'

+else

+  USE_INTERNAL_MSPACK_TRUE='#'

+  USE_INTERNAL_MSPACK_FALSE=

+fi

+

+fi

+

+

+if test "x$use_internal_mspack" = "xno"; then

+    mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS"

+fi

+

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5

 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }

     # Check whether --enable-maintainer-mode was given.

@@ -29223,6 +29342,14 @@ if test -z "${HAVE_LIBXML2_TRUE}" && test -z "${HAVE_LIBXML2_FALSE}"; then

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

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

 fi

+if test -z "${USE_INTERNAL_MSPACK_TRUE}" && test -z "${USE_INTERNAL_MSPACK_FALSE}"; then

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

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

+fi

+if test -z "${USE_INTERNAL_MSPACK_TRUE}" && test -z "${USE_INTERNAL_MSPACK_FALSE}"; then

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

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

+fi

 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

@@ -32082,6 +32209,14 @@ if test -z "${HAVE_LIBXML2_TRUE}" && test -z "${HAVE_LIBXML2_FALSE}"; then

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

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

 fi

+if test -z "${USE_INTERNAL_MSPACK_TRUE}" && test -z "${USE_INTERNAL_MSPACK_FALSE}"; then

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

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

+fi

+if test -z "${USE_INTERNAL_MSPACK_TRUE}" && test -z "${USE_INTERNAL_MSPACK_FALSE}"; then

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

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

+fi

 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

@@ -35106,6 +35241,19 @@ else

 fi

 fi

+

+

+   $as_echo_n "              libmspack   : "

+   if test "x$mspack_msg" = "xno"; then :

+  $as_echo "yes (disabled)"

+elif test "x$mspack_msg" = "xyes"; then :

+  $as_echo "yes"

+elif test "x$mspack_msg" = "x"; then :

+  $as_echo "yes"

+else

+  $as_echo "yes ($mspack_msg)"

+fi

+

 if test "x$XML_LIBS" = "x"; then

@@ -88,6 +88,11 @@ m4_include([m4/reorganization/libs/xml.m4])

 m4_include([m4/reorganization/libs/openssl.m4])

 m4_include([m4/reorganization/libs/json.m4])

 m4_include([m4/reorganization/libs/pcre.m4])

+m4_include([m4/reorganization/libs/libmspack.m4])

+

+if test "x$use_internal_mspack" = "xno"; then

+    mspack_msg="External, $LIBMSPACK_CFLAGS $LIBMSPACK_LIBS"

+fi

 AM_MAINTAINER_MODE

 m4_include([m4/reorganization/libs/libz.m4])

@@ -280,6 +285,7 @@ if test "x$PCRE_HOME" = "x"; then

 else

     CL_MSG_STATUS([pcre        ],[$PCRE_HOME],[$have_pcre])

 fi

+CL_MSG_STATUS([libmspack   ],[yes],[$mspack_msg])

 if test "x$XML_LIBS" = "x"; then 

     CL_MSG_STATUS([libxml2     ],[no],[])

 else

@@ -124,6 +124,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -297,6 +298,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -124,6 +124,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -331,6 +332,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -125,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -327,6 +328,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -129,6 +129,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -384,6 +385,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -174,8 +174,9 @@ c++/Makefile: c++/Makefile.nollvm.in

 distclean-recursive distdir maintainer-clean-recursive: c++/Makefile

 endif

+if USE_INTERNAL_MSPACK

 # libmspack version:

-LIBMSPACK_VERSION = 0:7:1

+LIBMSPACK_VERSION = 7:1:0

 libclammspack_la_CFLAGS = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wno-unused-parameter -I@top_srcdir@/libclammspack/mspack

 libclammspack_la_LDFLAGS = -version-info $(LIBMSPACK_VERSION) -no-undefined -export-symbols-regex '^mspack_'

@@ -229,10 +230,29 @@ libclammspack_la_SOURCES = \

 lib_LTLIBRARIES += libclammspack.la

 # EXTRA_DIST += @top_srcdir@/libclammspack/libclammspack.map

-MSPACK_CFLAGS = -I@top_srcdir@/libclammspack/mspack

+MSPACK_CFLAGS = -I@top_srcdir@/libclammspack/mspack -DHAVE_INTERNAL_MSPACK

 MSPACKLIBADD = -lclammspack

 MSPACKDEP = libclammspack.la

+else

+MSPACK_CFLAGS = $(LIBMSPACK_CFLAGS)

+MSPACKLIBADD = $(LIBMSPACK_LIBS)

+MSPACKDEP =

+

+# EXTRA_DIST += libmspack-0.5alpha

+libmspack/Makefile: 

+.PHONY: distdir distclean maintainer-clean

+distdir:

+	echo "make distdir requires --with-system-libmspack=no"

+	exit 1

+

+# nothing to do here, rules must exist for distclean to succeed

+distclean:

+	-rm -f Makefile

+maintainer-clean:

+

+distclean-recursive distdir maintainer-clean-recursive: libmspack/Makefile

+endif

 if ENABLE_YARA

 YARA_CFLAGS=-DHAVE_YARA

@@ -243,7 +263,7 @@ libclamav_nocxx_la_CFLAGS=$(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPF

 libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(MSPACKLIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@

 libclamav_la_DEPENDENCIES =  @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) $(MSPACKDEP) libclamav_internal_utils.la

-libclamav_la_CFLAGS =$(AM_CFLAGS) $(YARA_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ICONV_CPPFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@ $(MSPACK_CFLAGS)

+libclamav_la_CFLAGS = $(MSPACK_CFLAGS) $(AM_CFLAGS) $(YARA_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ICONV_CPPFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@

 libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ @ICONV_LDFLAGS@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined

 if VERSIONSCRIPT

@@ -108,8 +108,9 @@ target_triplet = @target@

 @ENABLE_UNRAR_TRUE@	@top_srcdir@/libclamunrar_iface/libclamunrar_iface.map

 @ENABLE_UNRAR_TRUE@@VERSIONSCRIPT_TRUE@am__append_5 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamunrar_iface/libclamunrar_iface.map

 @ENABLE_LLVM_TRUE@am__append_6 = c++

-@VERSIONSCRIPT_TRUE@am__append_7 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map

-@ENABLE_YARA_TRUE@am__append_8 = yara_arena.c \

+@USE_INTERNAL_MSPACK_TRUE@am__append_7 = libclammspack.la

+@VERSIONSCRIPT_TRUE@am__append_8 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map

+@ENABLE_YARA_TRUE@am__append_9 = yara_arena.c \

 @ENABLE_YARA_TRUE@	yara_arena.h \

 @ENABLE_YARA_TRUE@	yara_compiler.c \

 @ENABLE_YARA_TRUE@	yara_compiler.h \

@@ -154,6 +155,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -242,8 +244,9 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"

 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)

 @ENABLE_UNRAR_TRUE@am__DEPENDENCIES_1 = libclamunrar_iface.la

 am__DEPENDENCIES_2 =

-@ENABLE_LLVM_FALSE@am__DEPENDENCIES_3 = libclamav_nocxx.la

-@ENABLE_LLVM_TRUE@am__DEPENDENCIES_3 = c++/libclamavcxx.la

+@USE_INTERNAL_MSPACK_FALSE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2)

+@ENABLE_LLVM_FALSE@am__DEPENDENCIES_4 = libclamav_nocxx.la

+@ENABLE_LLVM_TRUE@am__DEPENDENCIES_4 = c++/libclamavcxx.la

 am__libclamav_la_SOURCES_DIST = matcher-ac.c matcher-ac.h matcher-bm.c \

 	matcher-bm.h matcher-hash.c matcher-hash.h matcher.c matcher.h \

 	others.c others.h readdb.c readdb.h cvd.c cvd.h dsig.c dsig.h \

@@ -551,23 +554,60 @@ libclamav_nocxx_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \

 	$(libclamav_nocxx_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \

 	$(LDFLAGS) -o $@

 libclammspack_la_LIBADD =

-am_libclammspack_la_OBJECTS = libclammspack_la-cabc.lo \

-	libclammspack_la-cabd.lo libclammspack_la-chmc.lo \

-	libclammspack_la-chmd.lo libclammspack_la-crc32.lo \

-	libclammspack_la-hlpc.lo libclammspack_la-hlpd.lo \

-	libclammspack_la-kwajc.lo libclammspack_la-kwajd.lo \

-	libclammspack_la-litc.lo libclammspack_la-litd.lo \

-	libclammspack_la-lzssd.lo libclammspack_la-lzxc.lo \

-	libclammspack_la-lzxd.lo libclammspack_la-mszipc.lo \

-	libclammspack_la-mszipd.lo libclammspack_la-oabc.lo \

-	libclammspack_la-oabd.lo libclammspack_la-qtmd.lo \

-	libclammspack_la-system.lo libclammspack_la-szddc.lo \

-	libclammspack_la-szddd.lo

+am__libclammspack_la_SOURCES_DIST = ../libclammspack/mspack/cab.h \

+	../libclammspack/mspack/cabc.c ../libclammspack/mspack/cabd.c \

+	../libclammspack/mspack/chm.h ../libclammspack/mspack/chmc.c \

+	../libclammspack/mspack/chmd.c ../libclammspack/mspack/crc32.c \

+	../libclammspack/mspack/crc32.h ../libclammspack/mspack/des.h \

+	../libclammspack/mspack/hlp.h ../libclammspack/mspack/hlpc.c \

+	../libclammspack/mspack/hlpd.c ../libclammspack/mspack/kwaj.h \

+	../libclammspack/mspack/kwajc.c \

+	../libclammspack/mspack/kwajd.c ../libclammspack/mspack/lit.h \

+	../libclammspack/mspack/litc.c ../libclammspack/mspack/litd.c \

+	../libclammspack/mspack/lzss.h ../libclammspack/mspack/lzssd.c \

+	../libclammspack/mspack/lzx.h ../libclammspack/mspack/lzxc.c \

+	../libclammspack/mspack/lzxd.c \

+	../libclammspack/mspack/mspack.h \

+	../libclammspack/mspack/mszip.h \

+	../libclammspack/mspack/mszipc.c \

+	../libclammspack/mspack/mszipd.c ../libclammspack/mspack/oab.h \

+	../libclammspack/mspack/oabc.c ../libclammspack/mspack/oabd.c \

+	../libclammspack/mspack/qtm.h ../libclammspack/mspack/qtmd.c \

+	../libclammspack/mspack/readbits.h \

+	../libclammspack/mspack/readhuff.h \

+	../libclammspack/mspack/sha.h ../libclammspack/mspack/system.c \

+	../libclammspack/mspack/system.h \

+	../libclammspack/mspack/szdd.h ../libclammspack/mspack/szddc.c \

+	../libclammspack/mspack/szddd.c

+@USE_INTERNAL_MSPACK_TRUE@am_libclammspack_la_OBJECTS =  \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-cabc.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-cabd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-chmc.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-chmd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-crc32.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-hlpc.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-hlpd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-kwajc.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-kwajd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-litc.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-litd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-lzssd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-lzxc.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-lzxd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-mszipc.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-mszipd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-oabc.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-oabd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-qtmd.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-system.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-szddc.lo \

+@USE_INTERNAL_MSPACK_TRUE@	libclammspack_la-szddd.lo

 libclammspack_la_OBJECTS = $(am_libclammspack_la_OBJECTS)

 libclammspack_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \

 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \

 	$(libclammspack_la_CFLAGS) $(CFLAGS) \

 	$(libclammspack_la_LDFLAGS) $(LDFLAGS) -o $@

+@USE_INTERNAL_MSPACK_TRUE@am_libclammspack_la_rpath = -rpath $(libdir)

 libclamunrar_la_LIBADD =

 am__libclamunrar_la_SOURCES_DIST = ../libclamunrar/archive.cpp \

 	../libclamunrar/arcread.cpp ../libclamunrar/blake2s.cpp \

@@ -743,7 +783,8 @@ SOURCES = $(libclamav_la_SOURCES) \

 DIST_SOURCES = $(am__libclamav_la_SOURCES_DIST) \

 	$(libclamav_internal_utils_la_SOURCES) \

 	$(libclamav_internal_utils_nothreads_la_SOURCES) \

-	$(libclamav_nocxx_la_SOURCES) $(libclammspack_la_SOURCES) \

+	$(libclamav_nocxx_la_SOURCES) \

+	$(am__libclammspack_la_SOURCES_DIST) \

 	$(am__libclamunrar_la_SOURCES_DIST) \

 	$(am__libclamunrar_iface_la_SOURCES_DIST)

 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \

@@ -909,6 +950,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -1043,7 +1086,7 @@ AM_YFLAGS = -d

 AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis $(LTDLINCL) \

 	$(am__append_1)

 AM_CFLAGS = @WERR_CFLAGS@

-lib_LTLIBRARIES = $(am__append_3) libclammspack.la libclamav.la

+lib_LTLIBRARIES = $(am__append_3) $(am__append_7) libclamav.la

 COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno

 EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) regex/engine.c \

 	tomsfastmath/sqr/fp_sqr_comba.c \

@@ -1176,68 +1219,71 @@ SUBDIRS = $(am__append_6)

 @ENABLE_LLVM_TRUE@LLVMDEP = c++/libclamavcxx.la

 # libmspack version:

-LIBMSPACK_VERSION = 0:5:0

-libclammspack_la_CFLAGS = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wno-unused-parameter -I@top_srcdir@/libclammspack/mspack

-libclammspack_la_LDFLAGS = -version-info $(LIBMSPACK_VERSION) -no-undefined -export-symbols-regex '^mspack_'

+@USE_INTERNAL_MSPACK_TRUE@LIBMSPACK_VERSION = 7:1:0

+@USE_INTERNAL_MSPACK_TRUE@libclammspack_la_CFLAGS = -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wno-unused-parameter -I@top_srcdir@/libclammspack/mspack

+@USE_INTERNAL_MSPACK_TRUE@libclammspack_la_LDFLAGS = -version-info $(LIBMSPACK_VERSION) -no-undefined -export-symbols-regex '^mspack_'

 # if VERSIONSCRIPT

 # libclammspack_la_LDFLAGS += -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclammspack/libclammspack.map

 # endif

-libclammspack_la_SOURCES = \

-	../libclammspack/mspack/cab.h \

-	../libclammspack/mspack/cabc.c \

-	../libclammspack/mspack/cabd.c \

-	../libclammspack/mspack/chm.h \

-	../libclammspack/mspack/chmc.c \

-	../libclammspack/mspack/chmd.c \

-	../libclammspack/mspack/crc32.c \

-	../libclammspack/mspack/crc32.h \

-	../libclammspack/mspack/des.h \

-	../libclammspack/mspack/hlp.h \

-	../libclammspack/mspack/hlpc.c \

-	../libclammspack/mspack/hlpd.c \

-	../libclammspack/mspack/kwaj.h \

-	../libclammspack/mspack/kwajc.c \

-	../libclammspack/mspack/kwajd.c \

-	../libclammspack/mspack/lit.h \

-	../libclammspack/mspack/litc.c \

-	../libclammspack/mspack/litd.c \

-	../libclammspack/mspack/lzss.h \

-	../libclammspack/mspack/lzssd.c \

-	../libclammspack/mspack/lzx.h \

-	../libclammspack/mspack/lzxc.c \

-	../libclammspack/mspack/lzxd.c \

-	../libclammspack/mspack/mspack.h \

-	../libclammspack/mspack/mszip.h \

-	../libclammspack/mspack/mszipc.c \

-	../libclammspack/mspack/mszipd.c \

-	../libclammspack/mspack/oab.h \

-	../libclammspack/mspack/oabc.c \

-	../libclammspack/mspack/oabd.c \

-	../libclammspack/mspack/qtm.h \

-	../libclammspack/mspack/qtmd.c \

-	../libclammspack/mspack/readbits.h \

-	../libclammspack/mspack/readhuff.h \

-	../libclammspack/mspack/sha.h \

-	../libclammspack/mspack/system.c \

-	../libclammspack/mspack/system.h \

-	../libclammspack/mspack/szdd.h \

-	../libclammspack/mspack/szddc.c \

-	../libclammspack/mspack/szddd.c

-

+@USE_INTERNAL_MSPACK_TRUE@libclammspack_la_SOURCES = \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/cab.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/cabc.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/cabd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/chm.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/chmc.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/chmd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/crc32.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/crc32.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/des.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/hlp.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/hlpc.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/hlpd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/kwaj.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/kwajc.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/kwajd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/lit.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/litc.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/litd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/lzss.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/lzssd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/lzx.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/lzxc.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/lzxd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/mspack.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/mszip.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/mszipc.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/mszipd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/oab.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/oabc.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/oabd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/qtm.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/qtmd.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/readbits.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/readhuff.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/sha.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/system.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/system.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/szdd.h \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/szddc.c \

+@USE_INTERNAL_MSPACK_TRUE@	../libclammspack/mspack/szddd.c

+

+@USE_INTERNAL_MSPACK_FALSE@MSPACK_CFLAGS = $(LIBMSPACK_CFLAGS)

 # EXTRA_DIST += @top_srcdir@/libclammspack/libclammspack.map

-MSPACK_CFLAGS = -I@top_srcdir@/libclammspack/mspack

-MSPACKLIBADD = -lclammspack

-MSPACKDEP = libclammspack.la

+@USE_INTERNAL_MSPACK_TRUE@MSPACK_CFLAGS = -I@top_srcdir@/libclammspack/mspack -DHAVE_INTERNAL_MSPACK

+@USE_INTERNAL_MSPACK_FALSE@MSPACKLIBADD = $(LIBMSPACK_LIBS)

+@USE_INTERNAL_MSPACK_TRUE@MSPACKLIBADD = -lclammspack

+@USE_INTERNAL_MSPACK_FALSE@MSPACKDEP = 

+@USE_INTERNAL_MSPACK_TRUE@MSPACKDEP = libclammspack.la

 @ENABLE_YARA_TRUE@YARA_CFLAGS = -DHAVE_YARA

 libclamav_nocxx_la_SOURCES = bytecode_nojit.c

 libclamav_nocxx_la_CFLAGS = $(AM_CFLAGS) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

 libclamav_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS@ @LIBCLAMAV_LIBS@ @LIBLTDL@ $(IFACELIBADD) $(MSPACKLIBADD) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@

 libclamav_la_DEPENDENCIES = @LTDLDEPS@ $(IFACEDEP) $(LLVMDEP) $(MSPACKDEP) libclamav_internal_utils.la

-libclamav_la_CFLAGS = $(AM_CFLAGS) $(YARA_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ICONV_CPPFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@ $(MSPACK_CFLAGS)

+libclamav_la_CFLAGS = $(MSPACK_CFLAGS) $(AM_CFLAGS) $(YARA_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\" @LIBCLAMAV_CPPFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @ICONV_CPPFLAGS@ @PCRE_CPPFLAGS@ @XML_CPPFLAGS@

 libclamav_la_LDFLAGS = @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ \

 	@ICONV_LDFLAGS@ $(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ \

-	-no-undefined $(am__append_7)

+	-no-undefined $(am__append_8)

 include_HEADERS = clamav.h

 libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \

 	matcher-bm.h matcher-hash.c matcher-hash.h matcher.c matcher.h \

@@ -1295,7 +1341,7 @@ libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \

 	openioc.h msdoc.c msdoc.h matcher-pcre.c matcher-pcre.h \

 	regex_pcre.c regex_pcre.h msxml.c msxml.h msxml_parser.c \

 	msxml_parser.h tiff.c tiff.h hwp.c hwp.h lzw/lzwdec.c \

-	lzw/lzwdec.h $(am__append_8) bignum.h bignum_fast.h \

+	lzw/lzwdec.h $(am__append_9) bignum.h bignum_fast.h \

 	tomsfastmath/addsub/fp_add.c tomsfastmath/addsub/fp_add_d.c \

 	tomsfastmath/addsub/fp_addmod.c tomsfastmath/addsub/fp_cmp.c \

 	tomsfastmath/addsub/fp_cmp_d.c \

@@ -1462,7 +1508,7 @@ libclamav_nocxx.la: $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_DEPENDENC

 	$(AM_V_CCLD)$(libclamav_nocxx_la_LINK)  $(libclamav_nocxx_la_OBJECTS) $(libclamav_nocxx_la_LIBADD) $(LIBS)

 libclammspack.la: $(libclammspack_la_OBJECTS) $(libclammspack_la_DEPENDENCIES) $(EXTRA_libclammspack_la_DEPENDENCIES) 

-	$(AM_V_CCLD)$(libclammspack_la_LINK) -rpath $(libdir) $(libclammspack_la_OBJECTS) $(libclammspack_la_LIBADD) $(LIBS)

+	$(AM_V_CCLD)$(libclammspack_la_LINK) $(am_libclammspack_la_rpath) $(libclammspack_la_OBJECTS) $(libclammspack_la_LIBADD) $(LIBS)

 libclamunrar.la: $(libclamunrar_la_OBJECTS) $(libclamunrar_la_DEPENDENCIES) $(EXTRA_libclamunrar_la_DEPENDENCIES) 

 	$(AM_V_CXXLD)$(libclamunrar_la_LINK) $(am_libclamunrar_la_rpath) $(libclamunrar_la_OBJECTS) $(libclamunrar_la_LIBADD) $(LIBS)

@@ -4291,7 +4337,7 @@ cscopelist-am: $(am__tagged_files)

 distclean-tags:

 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

-distdir: $(DISTFILES)

+@USE_INTERNAL_MSPACK_TRUE@distdir: $(DISTFILES)

 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

 	list='$(DISTFILES)'; \

@@ -4396,7 +4442,7 @@ clean: clean-recursive

 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \

 	clean-noinstLTLIBRARIES mostlyclean-am

-distclean: distclean-recursive

+@USE_INTERNAL_MSPACK_TRUE@distclean: distclean-recursive

 	-rm -rf ./$(DEPDIR)

 	-rm -f Makefile

 distclean-am: clean-am distclean-compile distclean-generic \

@@ -4442,7 +4488,8 @@ install-ps-am:

 installcheck-am:

-maintainer-clean: maintainer-clean-recursive

+@USE_INTERNAL_MSPACK_TRUE@maintainer-clean:  \

+@USE_INTERNAL_MSPACK_TRUE@	maintainer-clean-recursive

 	-rm -rf ./$(DEPDIR)

 	-rm -f Makefile

 maintainer-clean-am: distclean-am maintainer-clean-generic

@@ -4486,6 +4533,20 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES

 @ENABLE_LLVM_FALSE@	$(AM_V_at) cp $< $@

 @ENABLE_LLVM_FALSE@distclean-recursive distdir maintainer-clean-recursive: c++/Makefile

+# EXTRA_DIST += libmspack-0.5alpha

+@USE_INTERNAL_MSPACK_FALSE@libmspack/Makefile: 

+@USE_INTERNAL_MSPACK_FALSE@.PHONY: distdir distclean maintainer-clean

+@USE_INTERNAL_MSPACK_FALSE@distdir:

+@USE_INTERNAL_MSPACK_FALSE@	echo "make distdir requires --with-system-libmspack=no"

+@USE_INTERNAL_MSPACK_FALSE@	exit 1

+

+# nothing to do here, rules must exist for distclean to succeed

+@USE_INTERNAL_MSPACK_FALSE@distclean:

+@USE_INTERNAL_MSPACK_FALSE@	-rm -f Makefile

+@USE_INTERNAL_MSPACK_FALSE@maintainer-clean:

+

+@USE_INTERNAL_MSPACK_FALSE@distclean-recursive distdir maintainer-clean-recursive: libmspack/Makefile

+

 .PHONY: version.h.tmp

 version.c: version.h

 version.h: version.h.tmp

@@ -5755,8 +5755,8 @@ maintainer-clean-generic:

 	@echo "This command is intended for maintainers to use"

 	@echo "it deletes files that may require special tools to rebuild."

 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)

-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 @BUILD_EXTERNAL_LLVM_TRUE@clean-local:

+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 clean: clean-am

 clean-am: clean-generic clean-libtool clean-local \

@@ -370,7 +370,9 @@ int cli_scanmscab(cli_ctx *ctx, off_t sfx_offset)

 	}

 	cab_d->set_param(cab_d, MSCABD_PARAM_FIXMSZIP, 1);

+#if MSCABD_PARAM_SALVAGE

 	cab_d->set_param(cab_d, MSCABD_PARAM_SALVAGE, 1);

+#endif

 	cab_h = cab_d->open(cab_d, (char *)&mspack_fmap);

 	if (!cab_h) {

@@ -125,6 +125,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \

 	$(top_srcdir)/m4/reorganization/libs/libz.m4 \

 	$(top_srcdir)/m4/reorganization/libs/bzip.m4 \

 	$(top_srcdir)/m4/reorganization/libs/unrar.m4 \

@@ -376,6 +377,8 @@ LIBCLAMAV_VERSION = @LIBCLAMAV_VERSION@

 LIBCLAMSHARED_CPPFLAGS = @LIBCLAMSHARED_CPPFLAGS@

 LIBLTDL = @LIBLTDL@

 LIBM = @LIBM@

+LIBMSPACK_CFLAGS = @LIBMSPACK_CFLAGS@

+LIBMSPACK_LIBS = @LIBMSPACK_LIBS@

 LIBOBJS = @LIBOBJS@

 LIBPRELUDE_CFLAGS = @LIBPRELUDE_CFLAGS@

 LIBPRELUDE_CONFIG = @LIBPRELUDE_CONFIG@

@@ -114,6 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \

 	$(top_srcdir)/m4/reorganization/libs/openssl.m4 \

 	$(top_srcdir)/m4/reorganization/libs/json.m4 \

 	$(top_srcdir)/m4/reorganization/libs/pcre.m4 \

+	$(top_srcdir)/m4/reorganization/libs/libmspack.m4 \