X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=e182587cf5924c2353aa0f03b92e02b9974ff3a7;hb=f951f3835f81ff1deeef1e9d56e861db2c61924a;hp=43620a7da23c758e2fb67e5b6ed148b104190e60;hpb=bfc26cd584f008ec935051ff8efacd214df1306e;p=ptask.git

diff --git a/configure.ac b/configure.ac
index 43620a7..e182587 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,13 +4,14 @@
 AC_PREREQ([2.64])
 AC_INIT([ptask], [0.0.x],[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])
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_CC_C99
 AM_PROG_CC_C_O
 
 # Checks for header files.
@@ -35,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)
@@ -43,12 +44,29 @@ 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)
 
+# Gsettings
+GLIB_GSETTINGS
+
 AC_CONFIG_FILES([
  Makefile
+ icons/hicolor/scalable/Makefile
  po/Makefile.in
  src/Makefile
  src/glade/Makefile