@@ -355,7 +355,9 @@ libclamav_la_SOURCES = \

 	bytecode_api_impl.h \

 	bytecode_hooks.h \

 	cache.c \

-	cache.h

+	cache.h \

+	bytecode_detect.c \

+	bytecode_detect.h

 if !LINK_TOMMATH

 libclamav_la_SOURCES += bignum.c \

@@ -157,7 +157,8 @@ am__libclamav_la_SOURCES_DIST = clamav.h matcher-ac.c matcher-ac.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 bignum.c bignum_class.h sha1.c sha1.h

+	cache.h bytecode_detect.c bytecode_detect.h bignum.c \

+	bignum_class.h sha1.c sha1.h

 @LINK_TOMMATH_FALSE@am__objects_1 = libclamav_la-bignum.lo

 @BUILD_SHA1_TRUE@am__objects_2 = libclamav_la-sha1.lo

 am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \

@@ -208,7 +209,8 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.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 $(am__objects_1) $(am__objects_2)

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

+	$(am__objects_1) $(am__objects_2)

 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)

 AM_V_lt = $(am__v_lt_$(V))

 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))

@@ -659,7 +661,8 @@ libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \

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

+	cache.h bytecode_detect.c bytecode_detect.h $(am__append_7) \

+	$(am__append_8)

 noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la libclamav_nocxx.la

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

 @MAINTAINER_MODE_TRUE@BUILT_SOURCES = jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf

@@ -801,6 +804,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_api.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_api_decl.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_detect.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bytecode_vm.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-bzlib.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-cab.Plo@am__quote@

@@ -1697,6 +1701,14 @@ libclamav_la-cache.lo: cache.c

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

 @am__fastdepCC_FALSE@	$(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-cache.lo `test -f 'cache.c' || echo '$(srcdir)/'`cache.c

+libclamav_la-bytecode_detect.lo: bytecode_detect.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-bytecode_detect.lo -MD -MP -MF $(DEPDIR)/libclamav_la-bytecode_detect.Tpo -c -o libclamav_la-bytecode_detect.lo `test -f 'bytecode_detect.c' || echo '$(srcdir)/'`bytecode_detect.c

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

+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bytecode_detect.c' object='libclamav_la-bytecode_detect.lo' libtool=yes @AMDEPBACKSLASH@

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

+@am__fastdepCC_FALSE@	$(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-bytecode_detect.lo `test -f 'bytecode_detect.c' || echo '$(srcdir)/'`bytecode_detect.c

+

 libclamav_la-bignum.lo: bignum.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-bignum.lo -MD -MP -MF $(DEPDIR)/libclamav_la-bignum.Tpo -c -o libclamav_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c

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

@@ -47,7 +47,8 @@ libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS)

 libclamavcxx_la_SOURCES = bytecode2llvm.cpp\

 			  ClamBCRTChecks.cpp\

 			  ClamBCModule.h\

-			  ClamBCDiagnostics.h

+			  ClamBCDiagnostics.h\

+			  detect.cpp

 if BUILD_X86

 libclamavcxx_la_LIBADD+=libllvmx86codegen.la

 libclamavcxx_la_DEPENDENCIES+=libllvmx86codegen.la

@@ -108,7 +108,7 @@ CONFIG_CLEAN_FILES =

 CONFIG_CLEAN_VPATH_FILES =

 LTLIBRARIES = $(noinst_LTLIBRARIES)

 am_libclamavcxx_la_OBJECTS = libclamavcxx_la-bytecode2llvm.lo \

-	libclamavcxx_la-ClamBCRTChecks.lo

+	libclamavcxx_la-ClamBCRTChecks.lo libclamavcxx_la-detect.lo

 libclamavcxx_la_OBJECTS = $(am_libclamavcxx_la_OBJECTS)

 AM_V_lt = $(am__v_lt_$(V))

 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))

@@ -981,7 +981,8 @@ libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS)

 libclamavcxx_la_SOURCES = bytecode2llvm.cpp\

 			  ClamBCRTChecks.cpp\

 			  ClamBCModule.h\

-			  ClamBCDiagnostics.h

+			  ClamBCDiagnostics.h\

+			  detect.cpp

 LLVM_CXXFLAGS = -Woverloaded-virtual -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings

 unittest_CXXFLAGS = @NO_VARIADIC_MACROS@ @NO_MISSING_FIELD_INITIALIZERS@

@@ -2085,6 +2086,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/count-count.Po@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamavcxx_la-ClamBCRTChecks.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamavcxx_la-bytecode2llvm.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamavcxx_la-detect.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoogletest_la-TestMain.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoogletest_la-gtest-death-test.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgoogletest_la-gtest-filepath.Plo@am__quote@

@@ -2502,6 +2504,14 @@ libclamavcxx_la-ClamBCRTChecks.lo: ClamBCRTChecks.cpp

 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamavcxx_la_CXXFLAGS) $(CXXFLAGS) -c -o libclamavcxx_la-ClamBCRTChecks.lo `test -f 'ClamBCRTChecks.cpp' || echo '$(srcdir)/'`ClamBCRTChecks.cpp

+libclamavcxx_la-detect.lo: detect.cpp

+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamavcxx_la_CXXFLAGS) $(CXXFLAGS) -MT libclamavcxx_la-detect.lo -MD -MP -MF $(DEPDIR)/libclamavcxx_la-detect.Tpo -c -o libclamavcxx_la-detect.lo `test -f 'detect.cpp' || echo '$(srcdir)/'`detect.cpp

+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamavcxx_la-detect.Tpo $(DEPDIR)/libclamavcxx_la-detect.Plo

+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@

+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='detect.cpp' object='libclamavcxx_la-detect.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCXX_FALSE@	$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamavcxx_la_CXXFLAGS) $(CXXFLAGS) -c -o libclamavcxx_la-detect.lo `test -f 'detect.cpp' || echo '$(srcdir)/'`detect.cpp

+

 libgoogletest_la-gtest-death-test.lo: llvm/utils/unittest/googletest/gtest-death-test.cc

 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgoogletest_la_CPPFLAGS) $(CPPFLAGS) $(libgoogletest_la_CXXFLAGS) $(CXXFLAGS) -MT libgoogletest_la-gtest-death-test.lo -MD -MP -MF $(DEPDIR)/libgoogletest_la-gtest-death-test.Tpo -c -o libgoogletest_la-gtest-death-test.lo `test -f 'llvm/utils/unittest/googletest/gtest-death-test.cc' || echo '$(srcdir)/'`llvm/utils/unittest/googletest/gtest-death-test.cc

 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgoogletest_la-gtest-death-test.Tpo $(DEPDIR)/libgoogletest_la-gtest-death-test.Plo

@@ -179,6 +179,7 @@ CLAMAV_PRIVATE {

     cli_bytecode_printversion;

     cli_bytecode_describe;

     cli_printcxxver;

+    cli_detect_environment;

   local:

     *;

 };