X-Git-Url: http://git.wpitchoune.net/gitweb/?p=ppastats.git;a=blobdiff_plain;f=configure.ac;h=e6ca635d93d9fa4d0cc1fc556f8cf5471a8147b1;hp=1e6be59368038f9e3e6ca2d1d4ac401eab2fa0bd;hb=HEAD;hpb=95e531f5b9181ddba07c578c0150f00ff3accb25

diff --git a/configure.ac b/configure.ac
index 1e6be59..e6ca635 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.x],[jeanfi@gmail.com],[ppastats],[http://wpitchoune.net/ppastats])
+AC_INIT([ppastats], [1.3.3],[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,41 @@ 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 >= 0.11.99,
+		  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])], 
+		  [AC_MSG_WARN("json-c missing")])
+
+if test "$JSON_LIBS" == ""; then
+PKG_CHECK_MODULES(JSON, 
+		  json >= 0.11.99, 
+		  [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)
+AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK")
+
 AC_OUTPUT