@@ -34,9 +34,9 @@ if BUILD_EXTERNAL_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)

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

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

-libclamavcxx_la_DEPENDENCIES = @LLVMCONFIG_LIBFILES@ @JSON_LIBS@

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

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

+libclamavcxx_la_DEPENDENCIES = @LLVMCONFIG_LIBFILES@

 noinst_LTLIBRARIES = libclamavcxx.la

 libclamavcxx_la_SOURCES += PointerTracking.cpp

 libclamavcxx_la_SOURCES += PointerTracking.h

@@ -48,7 +48,7 @@ noinst_LTLIBRARIES = libclamavcxx.la libllvmsystem.la\

 libclamavcxx_la_LIBADD=libllvmjit.la

 libclamavcxx_la_DEPENDENCIES=libllvmjit.la libllvmcodegen.la libllvmsystem.la

 libclamavcxx_la_LDFLAGS=-no-undefined

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

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

 if BUILD_X86

@@ -267,11 +267,6 @@ AC_MSG_RESULT([$NO_VARIADIC_MACROS $NO_MISSING_FIELD_INITIALIZERS])

 AM_CONDITIONAL(BUILD_EXTERNAL_LLVM, [test -n "$llvmconfig"])

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

-AC_SUBST([JSON_LIBS])

-AC_SUBST([JSON_LDFLAGS])

-AC_SUBST([JSON_CPPFLAGS])

-

 AC_OUTPUT([

     Makefile

 ])