X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=0df89b98639e06af822d05a2ae30131c79ea9dff;hb=refs%2Fheads%2Fv1.2.0;hp=4ff863c3f9fb0ea0a3949aeb66d80eb7c1598510;hpb=d768378ec0d62f163a3b22886fbe6e267b5118f7;p=ppastats.git

diff --git a/configure.ac b/configure.ac
index 4ff863c..0df89b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT([ppastats], [0.0.8],[jeanfi@gmail.com],[ppastats],[http://wpitchoune.net/ppastats])
+AC_INIT([ppastats], [1.2.0],[jeanfi@gmail.com],[ppastats],[http://wpitchoune.net/ppastats])
 
-AM_INIT_AUTOMAKE([-Wall -Werror gnu])
+AM_INIT_AUTOMAKE([-Wall gnu])
 
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([config.h])
@@ -29,19 +29,40 @@ PKG_CHECK_MODULES(CURL, libcurl )
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)
 
-# Checks JSON 
-PKG_CHECK_MODULES(JSON, json )
+# Checks JSON
+JSON_LIBS=
+PKG_CHECK_MODULES(JSON, 
+		  json-c, 
+		  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])], 
+		  [AC_MSG_WARN("json-c missing")])
+
+if test "$JSON_LIBS" == ""; then
+PKG_CHECK_MODULES(JSON, 
+		  json, 
+		  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])
+		   AC_DEFINE([HAVE_JSON_0],[1],[Use JSON0])], 
+		  [AC_MSG_WARN("json0 missing")])
+fi
+
+AM_CONDITIONAL(JSON, test -n "$JSON_LIBS")
 AC_SUBST(JSON_CFLAGS)
 AC_SUBST(JSON_LIBS)
 
+AC_CHECK_TYPE(json_bool, [AC_DEFINE([HAVE_JSON_BOOL], 1, [Use json_bool])], [], [[#include <json/json.h>]])
+
 AC_CONFIG_FILES([ po/Makefile.in
  Makefile
  src/Makefile
  tests/Makefile
- www/footer.tpl
- www/Makefile 
+ themes/Makefile
+ themes/default/css/Makefile
+ themes/default/js/Makefile
+ themes/default/templates/Makefile
+ themes/default/templates/footer.tpl
 ])
 
 AC_CHECK_PROGS([HELP2MAN], [help2man])
 
+AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes)
+
 AC_OUTPUT