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

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

 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \

 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \

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

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

@@ -955,9 +954,6 @@ INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@

-JSON_CPPFLAGS = @JSON_CPPFLAGS@

-JSON_LDFLAGS = @JSON_LDFLAGS@

-JSON_LIBS = @JSON_LIBS@

 LD = @LD@

 LDFLAGS = @LDFLAGS@

 LIBOBJS = @LIBOBJS@

@@ -1069,20 +1065,20 @@ ACLOCAL_AMFLAGS = -I m4

 libclamavcxx_la_SOURCES = bytecode2llvm.cpp ClamBCRTChecks.cpp \

 	ClamBCModule.h ClamBCDiagnostics.h detect.cpp llvm30_compat.h \

 	$(am__append_1)

-@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS) -DLLVM_VERSION=${LLVM_VERSION} @JSON_CPPFLAGS@

+@BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_CXXFLAGS = $(LLVM_CXXFLAGS) -DLLVM_VERSION=${LLVM_VERSION}

 #$(LLVM_CONFIG): build-llvm

 # we know this will be built with GNU make, so its safe to use GNU make specific

 # $(shell ...)

 #LLVM_DEPS=$(shell $(LLVM_CONFIG) --libfiles jit nativecodegen)

-@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_CXXFLAGS = $(AM_CPPFLAGS) @LLVMCONFIG_CXXFLAGS@ -fexceptions -DLLVM_VERSION=${LLVM_VERSION} @JSON_CPPFLAGS@

+@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_CXXFLAGS = $(AM_CPPFLAGS) @LLVMCONFIG_CXXFLAGS@ -fexceptions -DLLVM_VERSION=${LLVM_VERSION}

 @BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_LDFLAGS = -no-undefined

-@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_LDFLAGS = @LLVMCONFIG_LDFLAGS@ @LLVMCONFIG_LIBS@ @LLVMCONFIG_LDFLAGS@ @JSON_LDFLAGS@

+@BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_LDFLAGS = @LLVMCONFIG_LDFLAGS@ @LLVMCONFIG_LIBS@ @LLVMCONFIG_LDFLAGS@

 @BUILD_EXTERNAL_LLVM_FALSE@libclamavcxx_la_DEPENDENCIES =  \

 @BUILD_EXTERNAL_LLVM_FALSE@	libllvmjit.la libllvmcodegen.la \

 @BUILD_EXTERNAL_LLVM_FALSE@	libllvmsystem.la $(am__append_4) \

 @BUILD_EXTERNAL_LLVM_FALSE@	$(am__append_7)

 @BUILD_EXTERNAL_LLVM_TRUE@libclamavcxx_la_DEPENDENCIES =  \

-@BUILD_EXTERNAL_LLVM_TRUE@	@LLVMCONFIG_LIBFILES@ @JSON_LIBS@ \

+@BUILD_EXTERNAL_LLVM_TRUE@	@LLVMCONFIG_LIBFILES@ \

 @BUILD_EXTERNAL_LLVM_TRUE@	$(am__append_4) $(am__append_7)

 @BUILD_EXTERNAL_LLVM_FALSE@noinst_LTLIBRARIES = libclamavcxx.la \

 @BUILD_EXTERNAL_LLVM_FALSE@	libllvmsystem.la libllvmcodegen.la \

@@ -5750,8 +5746,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@clean-local:

 @BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

+@BUILD_EXTERNAL_LLVM_TRUE@clean-local:

 clean: clean-am

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

@@ -3,19 +3,12 @@

 /* Define if building universal (internal helper macro) */

 #undef AC_APPLE_UNIVERSAL_BUILD

-/* Define to 1 if you have a deprecated version of the 'libjson' library

-   (-ljson). */

-#undef HAVE_DEPRECATED_JSON

-

 /* Define to 1 if you have the <dlfcn.h> header file. */

 #undef HAVE_DLFCN_H

 /* Define to 1 if you have the <inttypes.h> header file. */

 #undef HAVE_INTTYPES_H

-/* Define to 1 if you have the 'libjson' library (-ljson). */

-#undef HAVE_JSON

-

 /* Define to 1 if you have the <memory.h> header file. */

 #undef HAVE_MEMORY_H

@@ -637,9 +637,6 @@ ac_subst_vars='am__EXEEXT_FALSE

 am__EXEEXT_TRUE

 LTLIBOBJS

 LIBOBJS

-JSON_CPPFLAGS

-JSON_LDFLAGS

-JSON_LIBS

 BUILD_EXTERNAL_LLVM_FALSE

 BUILD_EXTERNAL_LLVM_TRUE

 NO_MISSING_FIELD_INITIALIZERS

@@ -802,7 +799,6 @@ with_system_llvm

 enable_llvm

 enable_optimized

 enable_all_jit_targets

-with_libjson

 '

       ac_precious_vars='build_alias

 host_alias

@@ -1466,8 +1462,6 @@ Optional Packages:

   --with-system-llvm      Use system llvm instead of built-in, uses full path

                           to llvm-config (default= search /usr/local or /usr

                           if not found in /usr/local)

-  --with-libjson=DIR   path to directory containing libjson (default=

-    /usr/local or /usr if not found in /usr/local)

 Some influential environment variables:

   CXX         C++ compiler command

@@ -15918,220 +15912,6 @@ else

 fi

-

-

-# Check whether --with-libjson was given.

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

-  withval=$with_libjson;

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjson installation" >&5

-$as_echo_n "checking for libjson installation... " >&6; }

-if test "X$withval" != "Xyes"

-then

-  LIBJSON_HOME="$withval"

-  if test -f "$LIBJSON_HOME/include/json/json.h" -o -f "$LIBJSON_HOME/include/json-c/json.h"

-  then

-    have_json_header="yes"

-  fi

-else

-  LIBJSON_HOME=/usr/local

-  if test -f "$LIBJSON_HOME/include/json/json.h" -o -f "$LIBJSON_HOME/include/json-c/json.h"

-  then

-    have_json_header="yes"

-  else

-    LIBJSON_HOME=/usr

-    if test -f "$LIBJSON_HOME/include/json/json.h" -o -f "$LIBJSON_HOME/include/json-c/json.h"

-    then

-      have_json_header="yes"

-    else

-      have_json_header="no"

-      LIBJSON_HOME=""

-    fi

-  fi

-fi

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

-$as_echo "$LIBJSON_HOME" >&6; }

-

-else

-

-have_json_header="no"

-

-fi

-

-

-if test "X$have_json_header" = "Xyes"

-then

-  if test -f "$LIBJSON_HOME/include/json/json.h"

-  then

-    JSON_INCLUDE="include/json"

-  fi

-  if test -f "$LIBJSON_HOME/include/json-c/json.h"

-  then

-    JSON_INCLUDE="include/json-c"

-  fi

-  if test -z $JSON_INCLUDE

-  then

-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: json header lost." >&5

-$as_echo "$as_me: WARNING: json header lost." >&2;}

-  fi

-

-  JSON_CPPFLAGS="-I$LIBJSON_HOME/$JSON_INCLUDE"

-  save_LDFLAGS="$LDFLAGS"

-  save_CFLAGS="$CFLAGS"

-  save_LIBS="$LIBS"

-  LIBS=""

-  JSON_LIBS=""

-  if test "$LIBJSON_HOME" != "/usr"

-  then

-    JSON_LDFLAGS="-L$LIBJSON_HOME/lib"

-    LDFLAGS="$LDFLAGS $JSON_LDFLAGS"

-    CFLAGS="$CFLAGS $JSON_CPPFLAGS"

-  fi

-

-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get_ex" >&5

-$as_echo_n "checking for library containing json_object_object_get_ex... " >&6; }

-if ${ac_cv_search_json_object_object_get_ex+:} false; then :

-  $as_echo_n "(cached) " >&6

-else

-  ac_func_search_save_LIBS=$LIBS

-cat confdefs.h - <<_ACEOF >conftest.$ac_ext

-/* end confdefs.h.  */

-

-/* Override any GCC internal prototype to avoid an error.

-   Use char because int might match the return type of a GCC

-   builtin and then its argument prototype would still apply.  */

-#ifdef __cplusplus

-extern "C"

-#endif

-char json_object_object_get_ex ();

-int

-main ()

-{

-return json_object_object_get_ex ();

-  ;

-  return 0;

-}

-_ACEOF

-for ac_lib in '' json-c json; do

-  if test -z "$ac_lib"; then

-    ac_res="none required"

-  else

-    ac_res=-l$ac_lib

-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"

-  fi

-  if ac_fn_c_try_link "$LINENO"; then :

-  ac_cv_search_json_object_object_get_ex=$ac_res

-fi

-rm -f core conftest.err conftest.$ac_objext \

-    conftest$ac_exeext

-  if ${ac_cv_search_json_object_object_get_ex+:} false; then :

-  break

-fi

-done

-if ${ac_cv_search_json_object_object_get_ex+:} false; then :

-

-else

-  ac_cv_search_json_object_object_get_ex=no

-fi

-rm conftest.$ac_ext

-LIBS=$ac_func_search_save_LIBS

-fi

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

-$as_echo "$ac_cv_search_json_object_object_get_ex" >&6; }

-ac_res=$ac_cv_search_json_object_object_get_ex

-if test "$ac_res" != no; then :

-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

-

-have_json="yes"

-have_deprecated_json="no"

-else

-

-have_json="no"

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get" >&5

-$as_echo_n "checking for library containing json_object_object_get... " >&6; }

-if ${ac_cv_search_json_object_object_get+:} false; then :

-  $as_echo_n "(cached) " >&6

-else

-  ac_func_search_save_LIBS=$LIBS

-cat confdefs.h - <<_ACEOF >conftest.$ac_ext

-/* end confdefs.h.  */

-

-/* Override any GCC internal prototype to avoid an error.

-   Use char because int might match the return type of a GCC

-   builtin and then its argument prototype would still apply.  */

-#ifdef __cplusplus

-extern "C"

-#endif

-char json_object_object_get ();

-int

-main ()

-{

-return json_object_object_get ();

-  ;

-  return 0;

-}

-_ACEOF

-for ac_lib in '' json-c json; do

-  if test -z "$ac_lib"; then

-    ac_res="none required"

-  else

-    ac_res=-l$ac_lib

-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"

-  fi

-  if ac_fn_c_try_link "$LINENO"; then :

-  ac_cv_search_json_object_object_get=$ac_res

-fi

-rm -f core conftest.err conftest.$ac_objext \

-    conftest$ac_exeext

-  if ${ac_cv_search_json_object_object_get+:} false; then :

-  break

-fi

-done

-if ${ac_cv_search_json_object_object_get+:} false; then :

-

-else

-  ac_cv_search_json_object_object_get=no

-fi

-rm conftest.$ac_ext

-LIBS=$ac_func_search_save_LIBS

-fi

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

-$as_echo "$ac_cv_search_json_object_object_get" >&6; }

-ac_res=$ac_cv_search_json_object_object_get

-if test "$ac_res" != no; then :

-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

-

-have_json="yes"

-have_deprecated_json="yes"

-

-fi

-

-

-fi

-

-

-  CFLAGS="$save_CFLAGS"

-  LDFLAGS="$save_LDFLAGS"

-fi

-

-if test "X$have_json" = "Xyes"; then

-

-$as_echo "#define HAVE_JSON 1" >>confdefs.h

-

-  if test "X$have_deprecated_json" = "Xyes"; then

-

-$as_echo "#define HAVE_DEPRECATED_JSON 1" >>confdefs.h

-

-  fi

-  JSON_LIBS="$LIBS"

-fi

-

-LIBS="$save_LIBS"

-

-

-

-

-

-

 ac_config_files="$ac_config_files Makefile"

 cat >confcache <<\_ACEOF