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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -397,6 +398,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -352,6 +353,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -288,6 +289,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -306,6 +307,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -319,6 +320,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -317,6 +318,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -323,6 +324,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -308,6 +309,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -306,6 +307,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -635,7 +635,9 @@ ac_includes_default="\

 #endif"

 enable_option_checking=no

-ac_subst_vars='ENABLE_LLVM_FALSE

+ac_subst_vars='ENABLE_YARA_FALSE

+ENABLE_YARA_TRUE

+ENABLE_LLVM_FALSE

 ENABLE_LLVM_TRUE

 ltdl_LTLIBOBJS

 ltdl_LIBOBJS

@@ -679,6 +681,7 @@ CLAMSCAN_CPPFLAGS

 FRESHCLAM_CPPFLAGS

 CLAMSUBMIT_CFLAGS

 CLAMSUBMIT_LIBS

+HAVE_YARA

 subdirs

 WERR_CFLAGS_MILTER

 WERR_CFLAGS

@@ -925,6 +928,7 @@ with_system_llvm

 with_llvm_linking

 enable_llvm

 enable_sha_collector_for_internal_use

+enable_yara

 with_libcurl

 '

       ac_precious_vars='build_alias

@@ -1604,6 +1608,7 @@ Optional Features:

                           enable warnings as error for distcheck [default=no]

   --enable-llvm           enable 'llvm' JIT/verifier support [default=auto]

+  --disable-yara          do not include yara support

 Optional Packages:

   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]

@@ -22828,6 +22833,24 @@ $as_echo "#define HAVE__INTERNAL__SHA_COLLECT 1" >>confdefs.h

 fi

+# Check whether --enable-yara was given.

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

+  enableval=$enable_yara; enable_yara=$enableval

+else

+  enable_yara="yes"

+fi

+

+

+if test "$enable_yara" = "yes"; then

+

+$as_echo "#define HAVE_YARA 1" >>confdefs.h

+]

+

+fi

+

+

+

+

 case "$host_os" in

 freebsd*)

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getvmmap in -lutil" >&5

@@ -25655,7 +25678,16 @@ else

   ENABLE_LLVM_FALSE=

 fi

+ if test "$enable_yara" != "no"; then

+  ENABLE_YARA_TRUE=

+  ENABLE_YARA_FALSE='#'

+else

+  ENABLE_YARA_TRUE='#'

+  ENABLE_YARA_FALSE=

+fi

+

 no_recursion="yes";

+

 ac_config_files="$ac_config_files libclamav/Makefile"

 cat >confcache <<\_ACEOF

@@ -25873,6 +25905,10 @@ if test -z "${ENABLE_LLVM_TRUE}" && test -z "${ENABLE_LLVM_FALSE}"; then

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

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

 fi

+if test -z "${ENABLE_YARA_TRUE}" && test -z "${ENABLE_YARA_FALSE}"; then

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

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

+fi

 : "${CONFIG_STATUS=./config.status}"

 ac_write_fail=0

@@ -28606,6 +28642,19 @@ fi

 fi

+

+   $as_echo_n "              yara        : "

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

+  $as_echo "$enable_yara (disabled)"

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

+  $as_echo "$enable_yara"

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

+  $as_echo "$enable_yara"

+else

+  $as_echo "$enable_yara ($enable_yara)"

+fi

+

+

 # Yep, downgrading the compiler avoids the bug too:

 # 4.0.x, and 4.1.0 are the known buggy versions

 # 3.4 doesn't have the bug

@@ -123,6 +123,7 @@ m4_include([m4/reorganization/clamdtop.m4])

 m4_include([m4/reorganization/distcheck.m4])

 m4_include([m4/reorganization/llvm.m4])

 m4_include([m4/reorganization/sha_collect.m4])

+m4_include([m4/reorganization/yara.m4])

 m4_include([m4/reorganization/bsd.m4])

@@ -180,7 +181,10 @@ fi

 AM_CONDITIONAL([ENABLE_LLVM],

 	       [test "$subdirfailed" != "yes" && test "$enable_llvm" != "no"])

+AM_CONDITIONAL([ENABLE_YARA],

+	       [test "$enable_yara" != "no"])

 no_recursion="yes";

+

 AC_OUTPUT([libclamav/Makefile])

 # Print a summary of what features we enabled

@@ -245,6 +249,7 @@ if test "x$XML_LIBS" = "x"; then

 else

     CL_MSG_STATUS([libxml2     ],[yes, from $XML_HOME],[])

 fi

+CL_MSG_STATUS([yara        ],[$enable_yara],[$enable_yara])

 # Yep, downgrading the compiler avoids the bug too:

 # 4.0.x, and 4.1.0 are the known buggy versions

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -254,6 +255,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -288,6 +289,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -284,6 +285,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -310,6 +311,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -138,12 +138,16 @@ c++/Makefile: c++/Makefile.nollvm.in

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

 endif

+if ENABLE_YARA

+YARA_CFLAGS=-DHAVE_YARA

+endif

+

 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) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@

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

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

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

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

 if VERSIONSCRIPT

@@ -445,7 +449,19 @@ libclamav_la_SOURCES = \

 	hostid.h \

 	openioc.c \

 	openioc.h \

-	yara_arena.c \

+	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

+

+if ENABLE_YARA

+libclamav_la_SOURCES += yara_arena.c \

 	yara_arena.h \

 	yara_compiler.c \

 	yara_compiler.h \

@@ -458,17 +474,8 @@ libclamav_la_SOURCES = \

 	yara_lexer.h \

 	yara_parser.c \

 	yara_parser.h \

-	yara_clam.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

+	yara_clam.h

+endif

 libclamav_la_SOURCES += bignum.h\

 	bignum_fast.h\

@@ -108,6 +108,21 @@ 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

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

+@ENABLE_YARA_TRUE@am__append_7 = yara_arena.c \

+@ENABLE_YARA_TRUE@	yara_arena.h \

+@ENABLE_YARA_TRUE@	yara_compiler.c \

+@ENABLE_YARA_TRUE@	yara_compiler.h \

+@ENABLE_YARA_TRUE@	yara_exec.c \

+@ENABLE_YARA_TRUE@	yara_exec.h \

+@ENABLE_YARA_TRUE@	yara_hash.c \

+@ENABLE_YARA_TRUE@	yara_hash.h \

+@ENABLE_YARA_TRUE@	yara_grammar.y \

+@ENABLE_YARA_TRUE@	yara_lexer.l \

+@ENABLE_YARA_TRUE@	yara_lexer.h \

+@ENABLE_YARA_TRUE@	yara_parser.c \

+@ENABLE_YARA_TRUE@	yara_parser.h \

+@ENABLE_YARA_TRUE@	yara_clam.h

+

 subdir = libclamav

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

 	yara_grammar.h yara_grammar.c yara_lexer.c \

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

 	$(top_srcdir)/m4/reorganization/distcheck.m4 \

 	$(top_srcdir)/m4/reorganization/llvm.m4 \

 	$(top_srcdir)/m4/reorganization/sha_collect.m4 \

+	$(top_srcdir)/m4/reorganization/yara.m4 \

 	$(top_srcdir)/m4/reorganization/bsd.m4 \

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

 	$(top_srcdir)/m4/reorganization/substitutions.m4 \

@@ -219,6 +235,135 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)

 @ENABLE_UNRAR_TRUE@am__DEPENDENCIES_1 = libclamunrar_iface.la

 @ENABLE_LLVM_FALSE@am__DEPENDENCIES_2 = libclamav_nocxx.la

 @ENABLE_LLVM_TRUE@am__DEPENDENCIES_2 = 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 \

+	scanners.c scanners.h textdet.c textdet.h filetypes.c \

+	filetypes.h filetypes_int.h rtf.c rtf.h blob.c blob.h mbox.c \

+	mbox.h message.c message.h table.c table.h text.c text.h \

+	ole2_extract.c ole2_extract.h vba_extract.c vba_extract.h \

+	cltypes.h msexpand.c msexpand.h pe.c pe.h pe_icons.c \

+	pe_icons.h disasm.c disasm.h disasm-common.h disasmpriv.h \

+	upx.c upx.h htmlnorm.c htmlnorm.h chmunpack.c chmunpack.h \

+	rebuildpe.c rebuildpe.h petite.c petite.h wwunpack.c \

+	wwunpack.h unsp.c unsp.h aspack.c aspack.h packlibs.c \

+	packlibs.h fsg.c fsg.h mew.c mew.h upack.c upack.h line.c \

+	line.h untar.c untar.h unzip.c unzip.h ooxml.c ooxml.h \

+	inflate64.c inflate64.h inffixed64.h inflate64_priv.h \

+	special.c special.h binhex.c binhex.h is_tar.c is_tar.h tnef.c \

+	tnef.h autoit.c autoit.h unarj.c unarj.h nsis/bzlib.c \

+	nsis/bzlib_private.h nsis/nsis_bzlib.h nsis/nulsft.c \

+	nsis/nulsft.h nsis/infblock.c nsis/nsis_zconf.h \

+	nsis/nsis_zlib.h nsis/nsis_zutil.h pdf.c pdf.h pdfng.c spin.c \

+	spin.h yc.c yc.h elf.c elf.h execs.h sis.c sis.h uuencode.c \

+	uuencode.h phishcheck.c phishcheck.h phish_domaincheck_db.c \

+	phish_domaincheck_db.h phish_whitelist.c phish_whitelist.h \

+	iana_cctld.h iana_tld.h regex_list.c regex_list.h \

+	regex_suffix.c regex_suffix.h mspack.c mspack.h cab.c cab.h \

+	entconv.c entconv.h entitylist.h encoding_aliases.h hashtab.c \

+	hashtab.h dconf.c dconf.h lzma_iface.c lzma_iface.h 7z_iface.c \

+	7z_iface.h 7z/7z.h 7z/7zAlloc.c 7z/7zAlloc.h 7z/7zBuf.c \

+	7z/7zBuf.h 7z/7zBuf2.c 7z/7zCrc.c 7z/7zCrc.h 7z/7zDec.c \

+	7z/7zFile.c 7z/7zFile.h 7z/7zIn.c 7z/7zStream.c 7z/7zVersion.h \

+	7z/Bcj2.c 7z/Bcj2.h 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/Delta.c 7z/Delta.h 7z/Alloc.h 7z/BraIA64.c 7z/CpuArch.c \

+	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 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 \

+	events.c events.h adc.c adc.h dmg.c dmg.h xar.c xar.h xdp.c \

+	xdp.h mbr.c mbr.h gpt.c gpt.h apm.c apm.h prtn_intxn.c \

+	prtn_intxn.h json_api.c json_api.h xz_iface.c xz_iface.h \

+	sf_base64decode.c sf_base64decode.h hfsplus.c hfsplus.h swf.c \

+	swf.h jpeg.c jpeg.h png.c png.h iso9660.c iso9660.h arc4.c \

+	arc4.h rijndael.c rijndael.h crtmgr.c crtmgr.h asn1.c asn1.h \

+	fpu.c fpu.h stats.c stats.h www.c www.h stats_json.c \

+	stats_json.h hostid.c hostid.h openioc.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 \

+	yara_arena.c yara_arena.h yara_compiler.c yara_compiler.h \

+	yara_exec.c yara_exec.h yara_hash.c yara_hash.h yara_grammar.y \

+	yara_lexer.l yara_lexer.h yara_parser.c yara_parser.h \

+	yara_clam.h 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 \

+	tomsfastmath/addsub/fp_cmp_mag.c tomsfastmath/addsub/fp_sub.c \

+	tomsfastmath/addsub/fp_sub_d.c tomsfastmath/addsub/fp_submod.c \

+	tomsfastmath/addsub/s_fp_add.c tomsfastmath/addsub/s_fp_sub.c \

+	tomsfastmath/bin/fp_radix_size.c \

+	tomsfastmath/bin/fp_read_radix.c \

+	tomsfastmath/bin/fp_read_signed_bin.c \

+	tomsfastmath/bin/fp_read_unsigned_bin.c \

+	tomsfastmath/bin/fp_reverse.c tomsfastmath/bin/fp_s_rmap.c \

+	tomsfastmath/bin/fp_signed_bin_size.c \

+	tomsfastmath/bin/fp_to_signed_bin.c \

+	tomsfastmath/bin/fp_to_unsigned_bin.c \

+	tomsfastmath/bin/fp_toradix.c tomsfastmath/bin/fp_toradix_n.c \

+	tomsfastmath/bin/fp_unsigned_bin_size.c \

+	tomsfastmath/bit/fp_cnt_lsb.c tomsfastmath/bit/fp_count_bits.c \

+	tomsfastmath/bit/fp_div_2.c tomsfastmath/bit/fp_div_2d.c \

+	tomsfastmath/bit/fp_lshd.c tomsfastmath/bit/fp_mod_2d.c \

+	tomsfastmath/bit/fp_rshd.c tomsfastmath/divide/fp_div.c \

+	tomsfastmath/divide/fp_div_d.c tomsfastmath/divide/fp_mod.c \

+	tomsfastmath/divide/fp_mod_d.c tomsfastmath/exptmod/fp_2expt.c \

+	tomsfastmath/exptmod/fp_exptmod.c tomsfastmath/misc/fp_ident.c \

+	tomsfastmath/misc/fp_set.c \

+	tomsfastmath/mont/fp_montgomery_calc_normalization.c \

+	tomsfastmath/mont/fp_montgomery_reduce.c \

+	tomsfastmath/mont/fp_montgomery_setup.c \

+	tomsfastmath/mul/fp_mul.c tomsfastmath/mul/fp_mul_comba.c \

+	tomsfastmath/mul/fp_mul_2.c tomsfastmath/mul/fp_mul_2d.c \

+	tomsfastmath/mul/fp_mul_comba_12.c \

+	tomsfastmath/mul/fp_mul_comba_17.c \

+	tomsfastmath/mul/fp_mul_comba_20.c \

+	tomsfastmath/mul/fp_mul_comba_24.c \

+	tomsfastmath/mul/fp_mul_comba_28.c \

+	tomsfastmath/mul/fp_mul_comba_3.c \

+	tomsfastmath/mul/fp_mul_comba_32.c \

+	tomsfastmath/mul/fp_mul_comba_4.c \

+	tomsfastmath/mul/fp_mul_comba_48.c \

+	tomsfastmath/mul/fp_mul_comba_6.c \

+	tomsfastmath/mul/fp_mul_comba_64.c \

+	tomsfastmath/mul/fp_mul_comba_7.c \

+	tomsfastmath/mul/fp_mul_comba_8.c \

+	tomsfastmath/mul/fp_mul_comba_9.c \

+	tomsfastmath/mul/fp_mul_comba_small_set.c \

+	tomsfastmath/mul/fp_mul_d.c tomsfastmath/mul/fp_mulmod.c \

+	tomsfastmath/numtheory/fp_invmod.c tomsfastmath/sqr/fp_sqr.c \

+	tomsfastmath/sqr/fp_sqr_comba_12.c \

+	tomsfastmath/sqr/fp_sqr_comba_17.c \

+	tomsfastmath/sqr/fp_sqr_comba_20.c \

+	tomsfastmath/sqr/fp_sqr_comba_24.c \

+	tomsfastmath/sqr/fp_sqr_comba_28.c \

+	tomsfastmath/sqr/fp_sqr_comba_3.c \

+	tomsfastmath/sqr/fp_sqr_comba_32.c \

+	tomsfastmath/sqr/fp_sqr_comba_4.c \

+	tomsfastmath/sqr/fp_sqr_comba_48.c \

+	tomsfastmath/sqr/fp_sqr_comba_6.c \

+	tomsfastmath/sqr/fp_sqr_comba_64.c \

+	tomsfastmath/sqr/fp_sqr_comba_7.c \

+	tomsfastmath/sqr/fp_sqr_comba_8.c \

+	tomsfastmath/sqr/fp_sqr_comba_9.c \

+	tomsfastmath/sqr/fp_sqr_comba_generic.c \

+	tomsfastmath/sqr/fp_sqr_comba_small_set.c \

+	tomsfastmath/sqr/fp_sqrmod.c

+@ENABLE_YARA_TRUE@am__objects_1 = libclamav_la-yara_arena.lo \

+@ENABLE_YARA_TRUE@	libclamav_la-yara_compiler.lo \

+@ENABLE_YARA_TRUE@	libclamav_la-yara_exec.lo \

+@ENABLE_YARA_TRUE@	libclamav_la-yara_hash.lo \

+@ENABLE_YARA_TRUE@	libclamav_la-yara_grammar.lo \

+@ENABLE_YARA_TRUE@	libclamav_la-yara_lexer.lo \

+@ENABLE_YARA_TRUE@	libclamav_la-yara_parser.lo

 am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \

 	libclamav_la-matcher-bm.lo libclamav_la-matcher-hash.lo \

 	libclamav_la-matcher.lo libclamav_la-others.lo \

@@ -284,12 +429,9 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \

 	libclamav_la-asn1.lo libclamav_la-fpu.lo libclamav_la-stats.lo \

 	libclamav_la-www.lo libclamav_la-stats_json.lo \

 	libclamav_la-hostid.lo libclamav_la-openioc.lo \

-	libclamav_la-yara_arena.lo libclamav_la-yara_compiler.lo \

-	libclamav_la-yara_exec.lo libclamav_la-yara_hash.lo \

-	libclamav_la-yara_grammar.lo libclamav_la-yara_lexer.lo \

-	libclamav_la-yara_parser.lo libclamav_la-msdoc.lo \

-	libclamav_la-matcher-pcre.lo libclamav_la-regex_pcre.lo \

-	libclamav_la-msxml.lo libclamav_la-msxml_parser.lo \

+	libclamav_la-msdoc.lo libclamav_la-matcher-pcre.lo \

+	libclamav_la-regex_pcre.lo libclamav_la-msxml.lo \

+	libclamav_la-msxml_parser.lo $(am__objects_1) \

 	libclamav_la-fp_add.lo libclamav_la-fp_add_d.lo \

 	libclamav_la-fp_addmod.lo libclamav_la-fp_cmp.lo \

 	libclamav_la-fp_cmp_d.lo libclamav_la-fp_cmp_mag.lo \

@@ -486,7 +628,7 @@ SOURCES = $(libclamav_la_SOURCES) \

 	$(libclamav_internal_utils_nothreads_la_SOURCES) \

 	$(libclamav_nocxx_la_SOURCES) $(libclamunrar_la_SOURCES) \

 	$(libclamunrar_iface_la_SOURCES)

-DIST_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) \

@@ -620,6 +762,7 @@ GENHTML = @GENHTML@

 GETENT = @GETENT@

 GPERF = @GPERF@

 GREP = @GREP@

+HAVE_YARA = @HAVE_YARA@

 INCLTDL = @INCLTDL@

 INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

@@ -859,11 +1002,12 @@ libclamav_internal_utils_nothreads_la_LIBADD = @SSL_LIBS@ @JSON_LIBS@ @PCRE_LIBS

 @ENABLE_LLVM_FALSE@LLVMDEP = libclamav_nocxx.la

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

 @ENABLE_LLVM_TRUE@SUBDIRS = c++

+@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) $(LLVMLIBADD) libclamav_internal_utils.la @THREAD_LIBS@ @LIBM@

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

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

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

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

 	$(XML_LIBS) -version-info @LIBCLAMAV_VERSION@ -no-undefined \

 	$(am__append_6)

@@ -921,15 +1065,12 @@ libclamav_la_SOURCES = matcher-ac.c matcher-ac.h matcher-bm.c \

 	iso9660.h arc4.c arc4.h rijndael.c rijndael.h crtmgr.c \

 	crtmgr.h asn1.c asn1.h fpu.c fpu.h stats.c stats.h www.c www.h \

 	stats_json.c stats_json.h hostid.c hostid.h openioc.c \

-	openioc.h yara_arena.c yara_arena.h yara_compiler.c \

-	yara_compiler.h yara_exec.c yara_exec.h yara_hash.c \

-	yara_hash.h yara_grammar.y yara_lexer.l yara_lexer.h \

-	yara_parser.c yara_parser.h yara_clam.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 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 \

+	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 $(am__append_7) 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 \

 	tomsfastmath/addsub/fp_cmp_mag.c tomsfastmath/addsub/fp_sub.c \

 	tomsfastmath/addsub/fp_sub_d.c tomsfastmath/addsub/fp_submod.c \

 	tomsfastmath/addsub/s_fp_add.c tomsfastmath/addsub/s_fp_sub.c \

@@ -2350,6 +2491,41 @@ libclamav_la-openioc.lo: openioc.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-openioc.lo `test -f 'openioc.c' || echo '$(srcdir)/'`openioc.c

+libclamav_la-msdoc.lo: msdoc.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-msdoc.lo -MD -MP -MF $(DEPDIR)/libclamav_la-msdoc.Tpo -c -o libclamav_la-msdoc.lo `test -f 'msdoc.c' || echo '$(srcdir)/'`msdoc.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-msdoc.Tpo $(DEPDIR)/libclamav_la-msdoc.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='msdoc.c' object='libclamav_la-msdoc.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-msdoc.lo `test -f 'msdoc.c' || echo '$(srcdir)/'`msdoc.c

+

+libclamav_la-matcher-pcre.lo: matcher-pcre.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-matcher-pcre.lo -MD -MP -MF $(DEPDIR)/libclamav_la-matcher-pcre.Tpo -c -o libclamav_la-matcher-pcre.lo `test -f 'matcher-pcre.c' || echo '$(srcdir)/'`matcher-pcre.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-matcher-pcre.Tpo $(DEPDIR)/libclamav_la-matcher-pcre.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='matcher-pcre.c' object='libclamav_la-matcher-pcre.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-matcher-pcre.lo `test -f 'matcher-pcre.c' || echo '$(srcdir)/'`matcher-pcre.c

+

+libclamav_la-regex_pcre.lo: regex_pcre.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-regex_pcre.lo -MD -MP -MF $(DEPDIR)/libclamav_la-regex_pcre.Tpo -c -o libclamav_la-regex_pcre.lo `test -f 'regex_pcre.c' || echo '$(srcdir)/'`regex_pcre.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-regex_pcre.Tpo $(DEPDIR)/libclamav_la-regex_pcre.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='regex_pcre.c' object='libclamav_la-regex_pcre.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-regex_pcre.lo `test -f 'regex_pcre.c' || echo '$(srcdir)/'`regex_pcre.c

+

+libclamav_la-msxml.lo: msxml.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-msxml.lo -MD -MP -MF $(DEPDIR)/libclamav_la-msxml.Tpo -c -o libclamav_la-msxml.lo `test -f 'msxml.c' || echo '$(srcdir)/'`msxml.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-msxml.Tpo $(DEPDIR)/libclamav_la-msxml.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='msxml.c' object='libclamav_la-msxml.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-msxml.lo `test -f 'msxml.c' || echo '$(srcdir)/'`msxml.c

+

+libclamav_la-msxml_parser.lo: msxml_parser.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-msxml_parser.lo -MD -MP -MF $(DEPDIR)/libclamav_la-msxml_parser.Tpo -c -o libclamav_la-msxml_parser.lo `test -f 'msxml_parser.c' || echo '$(srcdir)/'`msxml_parser.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-msxml_parser.Tpo $(DEPDIR)/libclamav_la-msxml_parser.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='msxml_parser.c' object='libclamav_la-msxml_parser.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-msxml_parser.lo `test -f 'msxml_parser.c' || echo '$(srcdir)/'`msxml_parser.c

+

 libclamav_la-yara_arena.lo: yara_arena.c

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-yara_arena.lo -MD -MP -MF $(DEPDIR)/libclamav_la-yara_arena.Tpo -c -o libclamav_la-yara_arena.lo `test -f 'yara_arena.c' || echo '$(srcdir)/'`yara_arena.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-yara_arena.Tpo $(DEPDIR)/libclamav_la-yara_arena.Plo

@@ -2399,41 +2575,6 @@ libclamav_la-yara_parser.lo: yara_parser.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-yara_parser.lo `test -f 'yara_parser.c' || echo '$(srcdir)/'`yara_parser.c

-libclamav_la-msdoc.lo: msdoc.c

-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-msdoc.lo -MD -MP -MF $(DEPDIR)/libclamav_la-msdoc.Tpo -c -o libclamav_la-msdoc.lo `test -f 'msdoc.c' || echo '$(srcdir)/'`msdoc.c

-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-msdoc.Tpo $(DEPDIR)/libclamav_la-msdoc.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='msdoc.c' object='libclamav_la-msdoc.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-msdoc.lo `test -f 'msdoc.c' || echo '$(srcdir)/'`msdoc.c

-

-libclamav_la-matcher-pcre.lo: matcher-pcre.c

-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-matcher-pcre.lo -MD -MP -MF $(DEPDIR)/libclamav_la-matcher-pcre.Tpo -c -o libclamav_la-matcher-pcre.lo `test -f 'matcher-pcre.c' || echo '$(srcdir)/'`matcher-pcre.c

-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-matcher-pcre.Tpo $(DEPDIR)/libclamav_la-matcher-pcre.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='matcher-pcre.c' object='libclamav_la-matcher-pcre.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-matcher-pcre.lo `test -f 'matcher-pcre.c' || echo '$(srcdir)/'`matcher-pcre.c

-

-libclamav_la-regex_pcre.lo: regex_pcre.c

-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-regex_pcre.lo -MD -MP -MF $(DEPDIR)/libclamav_la-regex_pcre.Tpo -c -o libclamav_la-regex_pcre.lo `test -f 'regex_pcre.c' || echo '$(srcdir)/'`regex_pcre.c

-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-regex_pcre.Tpo $(DEPDIR)/libclamav_la-regex_pcre.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='regex_pcre.c' object='libclamav_la-regex_pcre.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-regex_pcre.lo `test -f 'regex_pcre.c' || echo '$(srcdir)/'`regex_pcre.c

-

-libclamav_la-msxml.lo: msxml.c

-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-msxml.lo -MD -MP -MF $(DEPDIR)/libclamav_la-msxml.Tpo -c -o libclamav_la-msxml.lo `test -f 'msxml.c' || echo '$(srcdir)/'`msxml.c

-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-msxml.Tpo $(DEPDIR)/libclamav_la-msxml.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='msxml.c' object='libclamav_la-msxml.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-msxml.lo `test -f 'msxml.c' || echo '$(srcdir)/'`msxml.c

-

-libclamav_la-msxml_parser.lo: msxml_parser.c

-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-msxml_parser.lo -MD -MP -MF $(DEPDIR)/libclamav_la-msxml_parser.Tpo -c -o libclamav_la-msxml_parser.lo `test -f 'msxml_parser.c' || echo '$(srcdir)/'`msxml_parser.c

-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-msxml_parser.Tpo $(DEPDIR)/libclamav_la-msxml_parser.Plo

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='msxml_parser.c' object='libclamav_la-msxml_parser.lo' libtool=yes @AMDEPBACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-msxml_parser.lo `test -f 'msxml_parser.c' || echo '$(srcdir)/'`msxml_parser.c

-

 libclamav_la-fp_add.lo: tomsfastmath/addsub/fp_add.c

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-fp_add.lo -MD -MP -MF $(DEPDIR)/libclamav_la-fp_add.Tpo -c -o libclamav_la-fp_add.lo `test -f 'tomsfastmath/addsub/fp_add.c' || echo '$(srcdir)/'`tomsfastmath/addsub/fp_add.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-fp_add.Tpo $(DEPDIR)/libclamav_la-fp_add.Plo

@@ -55,8 +55,10 @@

 #include "perflogging.h"

 #include "bytecode_priv.h"

 #include "bytecode_api_impl.h"

+#ifdef HAVE_YARA

 #include "yara_clam.h"

 #include "yara_exec.h"

+#endif

 #ifdef CLI_PERF_LOGGING

@@ -763,6 +765,7 @@ static int lsig_eval(cli_ctx *ctx, struct cli_matcher *root, struct cli_ac_data

     return CL_CLEAN;

 }

+#ifdef HAVE_YARA

 static int yara_eval(cli_ctx *ctx, struct cli_matcher *root, struct cli_ac_data *acdata, struct cli_target_info *target_info, const char *hash, uint32_t lsid)

 {

     struct cli_ac_lsig *ac_lsig = root->ac_lsigtable[lsid];

@@ -787,6 +790,7 @@ static int yara_eval(cli_ctx *ctx, struct cli_matcher *root, struct cli_ac_data

     }

     return rc;

 }

+#endif

 int cli_exp_eval(cli_ctx *ctx, struct cli_matcher *root, struct cli_ac_data *acdata, struct cli_target_info *target_info, const char *hash)

 {

@@ -797,8 +801,10 @@ int cli_exp_eval(cli_ctx *ctx, struct cli_matcher *root, struct cli_ac_data *acd

     for(i = 0; i < root->ac_lsigs; i++) {

         if (root->ac_lsigtable[i]->type == CLI_LSIG_NORMAL)

             rc = lsig_eval(ctx, root, acdata, target_info, hash, i);

+#ifdef HAVE_YARA

         else if (root->ac_lsigtable[i]->type == CLI_YARA_NORMAL || root->ac_lsigtable[i]->type == CLI_YARA_OFFSET)

             rc = yara_eval(ctx, root, acdata, target_info, hash, i);

+#endif

         if (rc == CL_VIRUS) {

             viruses_found = 1;

             if (SCAN_ALL)

@@ -450,6 +450,8 @@ struct cl_engine *cl_engine_new(void)

     new->pcre_recmatch_limit = CLI_DEFAULT_PCRE_RECMATCH_LIMIT;

     new->pcre_max_filesize = CLI_DEFAULT_PCRE_MAX_FILESIZE;

+#ifdef HAVE_YARA

+

     /* YARA */

     if (cli_yara_init(new) != CL_SUCCESS) {

         cli_errmsg("cli_engine_new: failed to initialize YARA\n");

@@ -464,6 +466,8 @@ struct cl_engine *cl_engine_new(void)

         return NULL;

     }

+#endif

+

     cli_dbgmsg("Initialized %s engine\n", cl_retver());

     return new;

 }

@@ -50,10 +50,14 @@

 #include "bytecode_api.h"

 #include "events.h"

 #include "crtmgr.h"

+

 #ifdef HAVE_JSON

 #include "json.h"

 #endif

+

+#ifdef HAVE_YARA

 #include "yara_clam.h"

+#endif

 #if HAVE_LIBXML2

 #define CLAMAV_MIN_XMLREADER_FLAGS (XML_PARSE_NOERROR | XML_PARSE_NONET)

@@ -375,8 +379,10 @@ struct cl_engine {

     uint64_t pcre_recmatch_limit;

     uint64_t pcre_max_filesize;

+#ifdef HAVE_YARA

     /* YARA */

     struct _yara_global * yara_global;

+#endif

 };

 struct cl_settings {

@@ -78,14 +78,18 @@

 #include "bytecode_priv.h"

 #include "cache.h"

 #include "openioc.h"

+

 #ifdef CL_THREAD_SAFE

 #  include <pthread.h>

 static pthread_mutex_t cli_ref_mutex = PTHREAD_MUTEX_INITIALIZER;

 #endif

+

+#ifdef HAVE_YARA

 #include "yara_clam.h"

 #include "yara_compiler.h"

 #include "yara_grammar.h"

 #include "yara_lexer.h"

+#endif

 #define MAX_LDB_SUBSIGS 64

@@ -2986,6 +2990,7 @@ static int cli_loadopenioc(FILE *fs, const char *dbname, struct cl_engine *engin

     return rc;

 }

+#ifdef HAVE_YARA

 #define YARA_DEBUG 1

 #if (YARA_DEBUG == 2)

 #define cli_yaramsg(...) cli_errmsg(__VA_ARGS__)

@@ -4054,6 +4059,7 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,

     return CL_SUCCESS;

 }

+#endif

 /*      0            1           2          3

  * PasswordName;Attributes;PWStorageType;Password

@@ -4352,8 +4358,10 @@ int cli_load(const char *filename, struct cl_engine *engine, unsigned int *signo

 	ret = cli_loadmscat(fs, dbname, engine, options, dbio);

     } else if(cli_strbcasestr(dbname, ".ioc")) {

 	ret = cli_loadopenioc(fs, dbname, engine, options);

+#ifdef HAVE_YARA

     } else if(cli_strbcasestr(dbname, ".yar") || cli_strbcasestr(dbname, ".yara")) {

         ret = cli_loadyara(fs, engine, signo, options, dbio, filename);

+#endif

     } else if(cli_strbcasestr(dbname, ".pwdb")) {

         ret = cli_loadpwdb(fs, engine, options, 0, dbio);

     } else {

@@ -5049,7 +5057,9 @@ int cl_engine_free(struct cl_engine *engine)

     if(engine->mempool) mpool_destroy(engine->mempool);

 #endif

+#ifdef HAVE_YARA

     cli_yara_free(engine);

+#endif

     free(engine);

     return CL_SUCCESS;

@@ -5063,7 +5073,7 @@ int cl_engine_compile(struct cl_engine *engine)

     if(!engine)

 	return CL_ENULLARG;

-

+#ifdef HAVE_YARA

     /* Free YARA hash tables - only needed for parse and load */

     if (engine->yara_global != NULL) {

         if (engine->yara_global->rules_table)

@@ -5072,6 +5082,7 @@ int cl_engine_compile(struct cl_engine *engine)