X-Git-Url: http://git.wpitchoune.net/gitweb/?p=ptask.git;a=blobdiff_plain;f=configure.ac;h=4b397504a155ad3f4170db2ea906cfaf3c7f84ed;hp=00ff4c6dcdad7a0ff9de241ddc2b9cc7a21724ba;hb=fdf70aa967f489ec5d2d32d286d99a63068d81e1;hpb=464cae462442ca890698a0d54e7fb927becd4347

diff --git a/configure.ac b/configure.ac
index 00ff4c6..4b39750 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # 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], [0.0.9a],[jeanfi@gmail.com],[ptask],[http://wpitchoune.net/ptask])
 
 AM_INIT_AUTOMAKE([-Wall gnu])
 
@@ -36,7 +36,7 @@ PKG_CHECK_MODULES(GTK, gtk+-3.0)
 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)