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

diff --git a/configure.ac b/configure.ac
index 00ff4c6..e182587 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)