From da455ce3cbcf0bd99f8f71f2a62e59af01ba26c0 Mon Sep 17 00:00:00 2001
From: Kevin Lin <klin@sourcefire.com>
Date: Tue, 7 Oct 2014 16:10:43 -0400
Subject: [PATCH] bb#11139 - removed configuring json for c++ source and LLVM

---
 libclamav/c++/Makefile.am  | 8 ++++----
 libclamav/c++/configure.ac | 5 -----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/libclamav/c++/Makefile.am b/libclamav/c++/Makefile.am
index aaae91f0c..7eaca78f9 100644
--- a/libclamav/c++/Makefile.am
+++ b/libclamav/c++/Makefile.am
@@ -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
diff --git a/libclamav/c++/configure.ac b/libclamav/c++/configure.ac
index 2428f6a1a..1cadcdaf0 100644
--- a/libclamav/c++/configure.ac
+++ b/libclamav/c++/configure.ac
@@ -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
 ])