From 5dd86951db386391442a35f19f72939f4af0c2e1 Mon Sep 17 00:00:00 2001

From: Jakub Filak <jfilak@redhat.com>

Date: Tue, 29 Jul 2014 15:38:26 +0200

Subject: [PATCH 13/24] configure.ac: Fix json-c detection for json-c >= 0.11

json-c-0.11 renamed the pkgconfig file to json-c

https://github.com/json-c/json-c/blob/master/ChangeLog The configure.ac

file was fixed to look for json-c if json is not available.

Signed-off-by: Markos Chandras <hwoarang@gentoo.org>

Signed-off-by: Martin Milata <mmilata@redhat.com>

libreport commit commit 07a33e562e99fa68332925c402538341d8cd82e2

Author: Markos Chandras <hwoarang@gentoo.org>

Signed-off-by: Jakub Filak <jfilak@redhat.com>

---

 configure.ac | 8 +++++++-

 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac

index 03882e9..eb42231 100644

--- a/configure.ac

+++ b/configure.ac

@@ -273,7 +273,13 @@ ABRT_PARSE_WITH([bodhi]))

 if test -z "$NO_BODHI"

 then

-PKG_CHECK_MODULES([JSON_C], [json])

+PKG_CHECK_MODULES([JSON_C], [json], [

+    JSON_C_PACKAGE=json

+], [

+    PKG_CHECK_MODULES([JSON_C], [json-c], [

+        JSON_C_PACKAGE=json-c

+    ])

+])

 PKG_CHECK_MODULES([LIBREPORT_WEB], [libreport-web])

 AM_CONDITIONAL(BUILD_BODHI, true)

 else

-- 

2.1.0