10d019
From cb6d2019766a6c8c5516fd8859cedf0052f03293 Mon Sep 17 00:00:00 2001
10d019
From: Petr Mensik <pemensik@redhat.com>
10d019
Date: Thu, 25 Jul 2019 11:37:57 +0200
10d019
Subject: [PATCH] Skip support of jsoncpp
10d019
10d019
Bind cannot be compiled when jsoncpp-devel is installed. Remove support
10d019
for jsoncpp, use only json-c-devel. Bind 9.15 has already support for
10d019
--with-json-c, do not yet introduce it.
10d019
---
10d019
 configure.ac | 17 ++---------------
10d019
 1 file changed, 2 insertions(+), 15 deletions(-)
10d019
10d019
diff --git a/configure.ac b/configure.ac
10d019
index 6d05337..5ce83b5 100644
10d019
--- a/configure.ac
10d019
+++ b/configure.ac
10d019
@@ -2594,15 +2594,7 @@ case "$use_libjson" in
10d019
 	auto|yes)
10d019
 		for d in /usr /usr/local /opt/local
10d019
 		do
10d019
-			if test -f "${d}/include/json/json.h"
10d019
-			then
10d019
-				if test ${d} != /usr
10d019
-				then
10d019
-					libjson_cflags="-I ${d}/include"
10d019
-					LIBS="$LIBS -L${d}/lib"
10d019
-				fi
10d019
-				have_libjson="yes"
10d019
-			elif test -f "${d}/include/json-c/json.h"
10d019
+			if test -f "${d}/include/json-c/json.h"
10d019
 			then
10d019
 				if test ${d} != /usr
10d019
 				then
10d019
@@ -2615,12 +2607,7 @@ case "$use_libjson" in
10d019
 		done
10d019
 		;;
10d019
 	*)
10d019
-		if test -f "${use_libjson}/include/json/json.h"
10d019
-		then
10d019
-			libjson_cflags="-I${use_libjson}/include"
10d019
-			LIBS="$LIBS -L${use_libjson}/lib"
10d019
-			have_libjson="yes"
10d019
-		elif test -f "${use_libjson}/include/json-c/json.h"
10d019
+		if test -f "${use_libjson}/include/json-c/json.h"
10d019
 		then
10d019
 			libjson_cflags="-I${use_libjson}/include"
10d019
 			LIBS="$LIBS -L${use_libjson}/lib"
10d019
-- 
10d019
2.20.1
10d019