fixed compilation with newer json lib

diff --git a/po/Makefile b/po/Makefile
index 00efa4a..4fa184e 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -35,12 +35,12 @@ INSTALL_DATA = ${INSTALL} -m 644
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ppastats/trunk/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/ppastats/trunk/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ppastats/trunk/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ppastats/trunk/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/ppastats/trunk/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/ppastats/trunk/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 

diff --git a/po/Makefile.in b/po/Makefile.in
index 66e9f98..ea311c8 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -35,12 +35,12 @@ INSTALL_DATA = ${INSTALL} -m 644
 # We use $(mkdir_p).
 # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
 # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ppastats/trunk/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/ppastats/trunk/install-sh does not start with $(SHELL), so we add it.
 # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
 # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
 # versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ppastats/trunk/install-sh -d
-install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune/svnpub/ppastats/trunk/install-sh
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/ppastats/trunk/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/ppastats/trunk/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p
 

diff --git a/src/fcache.h b/src/fcache.h
index 89bd9d8..de50b88 100644 (file)
--- a/src/fcache.h
+++ b/src/fcache.h
@@ -20,7 +20,7 @@
 #ifndef _PPASTATS_FCACHE_H_
 #define _PPASTATS_FCACHE_H_
 
-#include <json/json.h>
+#include <json.h>
 
 char *fcache_get(const char *k);
 void fcache_put(const char *k, const char *v);

diff --git a/src/html.c b/src/html.c
index a6acc2f..a6536ae 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include <json/json.h>
+#include <json.h>
 
 #include "html.h"
 #include "io.h"

diff --git a/src/lp_json.h b/src/lp_json.h
index 99add45..f40c5c3 100644 (file)
--- a/src/lp_json.h
+++ b/src/lp_json.h
@@ -20,14 +20,14 @@
 #ifndef _PPASTATS_LP_JSON_H_
 #define _PPASTATS_LP_JSON_H_
 
-#include <json/json.h>
+#include <json.h>
 
 #include <config.h>
 
 /* Declares json_bool to have consistent code even with
    old json lib releases using boolean instead of json_bool.*/
 #ifndef HAVE_JSON_BOOL
-typedef boolean json_bool;
+typedef int json_bool;
 #endif
 
 #include "lp.h"

diff --git a/src/lp_ws.c b/src/lp_ws.c
index 21b9310..c58faaf 100644 (file)
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <json/json.h>
+#include <json.h>
 
 #include "cache.h"
 #include "fcache.h"

diff --git a/src/ppastats.1 b/src/ppastats.1
index 166c065..6c31493 100644 (file)
--- a/src/ppastats.1
+++ b/src/ppastats.1
@@ -1,4 +1,4 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.43.3.
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
 .TH PPASTATS "1" "February 2014" "ppastats 0.0.x" "User Commands"
 .SH NAME
 ppastats \- PPA Statistics command line tool