|
Jakub Filak |
9dc4db8 |
From cc36c5c2b109fa7ac864400e695c88808b19a5ed Mon Sep 17 00:00:00 2001
|
|
Jakub Filak |
9dc4db8 |
From: Jakub Filak <jfilak@redhat.com>
|
|
Jakub Filak |
9dc4db8 |
Date: Fri, 25 Jul 2014 12:39:28 +0200
|
|
Jakub Filak |
e5933ff |
Subject: [PATCH 11/20] ureport: include json.h accordingly to json-c CFLAGS
|
|
Jakub Filak |
9dc4db8 |
|
|
Jakub Filak |
9dc4db8 |
commit 1cef1ddc28f327534cfdb433d1f2e10d01b10f44
|
|
Jakub Filak |
9dc4db8 |
|
|
Jakub Filak |
9dc4db8 |
Signed-off-by: Jakub Filak <jfilak@redhat.com>
|
|
Jakub Filak |
9dc4db8 |
---
|
|
Jakub Filak |
9dc4db8 |
src/plugins/Makefile.am | 2 ++
|
|
Jakub Filak |
9dc4db8 |
src/plugins/ureport.c | 2 +-
|
|
Jakub Filak |
9dc4db8 |
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
Jakub Filak |
9dc4db8 |
|
|
Jakub Filak |
9dc4db8 |
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
|
|
Jakub Filak |
9dc4db8 |
index 2d95f07..7e0e753 100644
|
|
Jakub Filak |
9dc4db8 |
--- a/src/plugins/Makefile.am
|
|
Jakub Filak |
9dc4db8 |
+++ b/src/plugins/Makefile.am
|
|
Jakub Filak |
9dc4db8 |
@@ -260,9 +260,11 @@ reporter_ureport_CPPFLAGS = \
|
|
Jakub Filak |
9dc4db8 |
-I$(srcdir)/../lib \
|
|
Jakub Filak |
9dc4db8 |
$(GLIB_CFLAGS) \
|
|
Jakub Filak |
9dc4db8 |
$(LIBREPORT_CFLAGS) \
|
|
Jakub Filak |
9dc4db8 |
+ $(JSON_C_CFLAGS) \
|
|
Jakub Filak |
9dc4db8 |
-DPLUGINS_CONF_DIR=\"$(REPORT_PLUGINS_CONF_DIR)\" \
|
|
Jakub Filak |
9dc4db8 |
-D_GNU_SOURCE
|
|
Jakub Filak |
9dc4db8 |
reporter_ureport_LDADD = \
|
|
Jakub Filak |
9dc4db8 |
+ $(JSON_C_LIBS) \
|
|
Jakub Filak |
9dc4db8 |
../lib/libreport.la \
|
|
Jakub Filak |
9dc4db8 |
../lib/libreport-web.la
|
|
Jakub Filak |
9dc4db8 |
endif
|
|
Jakub Filak |
9dc4db8 |
diff --git a/src/plugins/ureport.c b/src/plugins/ureport.c
|
|
Jakub Filak |
9dc4db8 |
index e6237cc..063a1e7 100644
|
|
Jakub Filak |
9dc4db8 |
--- a/src/plugins/ureport.c
|
|
Jakub Filak |
9dc4db8 |
+++ b/src/plugins/ureport.c
|
|
Jakub Filak |
9dc4db8 |
@@ -17,7 +17,7 @@
|
|
Jakub Filak |
9dc4db8 |
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
Jakub Filak |
9dc4db8 |
*/
|
|
Jakub Filak |
9dc4db8 |
|
|
Jakub Filak |
9dc4db8 |
-#include <json/json.h>
|
|
Jakub Filak |
9dc4db8 |
+#include <json.h>
|
|
Jakub Filak |
9dc4db8 |
#include "internal_libreport.h"
|
|
Jakub Filak |
9dc4db8 |
#include "ureport.h"
|
|
Jakub Filak |
9dc4db8 |
#include "libreport_curl.h"
|
|
Jakub Filak |
9dc4db8 |
--
|
|
Jakub Filak |
e5933ff |
2.0.4
|
|
Jakub Filak |
9dc4db8 |
|