recent version of libjson has remove is_error which was checking

[ptask.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 423a386..1ec74e4 100644 (file)
--- 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([ptask], [0.0.x],[jeanfi@gmail.com],[ptask],[http://wpitchoune.net/ptask])
+AC_INIT([ptask], [1.0.1],[jeanfi@gmail.com],[ptask],[http://wpitchoune.net/ptask])
 
-AM_INIT_AUTOMAKE([-Wall -Werror gnu])
+AM_INIT_AUTOMAKE([-Wall gnu])
 
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([config.h])
@@ -31,12 +31,12 @@ AC_SUBST(XEXT_CFLAGS)
 AC_SUBST(XEXT_LIBS)
 
 # Checks GTK+ 3.0
-PKG_CHECK_MODULES(GTK, gtk+-3.0)               
+PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= 3.12])
 # ensure that only allowed headers are included
 GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES "
 # ensure that no gtk deprecated symbols are used
 GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED "
-GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
+# GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
 # ensure use of accessors
 GTK_CFLAGS+=" -DGSEAL_ENABLE "
 AC_SUBST(GTK_CFLAGS)
@@ -44,7 +44,20 @@ AC_SUBST(GTK_LIBS)
 
 # Check JSON
 JSON_LIBS=
-PKG_CHECK_MODULES(JSON, json)
+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)