X-Git-Url: http://git.wpitchoune.net/gitweb/?p=ptask.git;a=blobdiff_plain;f=configure.ac;h=1ec74e45fcc7a3e64a72c506c7a4fd93b5e96ec8;hp=8883d1037071db76af5945bbbe53e0a68227b846;hb=HEAD;hpb=e27cd0a70c5ed37621312b117606d8db535fc59e diff --git a/configure.ac b/configure.ac index 8883d10..1ec74e4 100644 --- a/configure.ac +++ b/configure.ac @@ -2,14 +2,16 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.64]) -AC_INIT([gtask], [0.0.x],[jeanfi@gmail.com],[gtask],[http://wpitchoune.net/gtask]) +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]) # Checks for programs. AC_PROG_CC +AC_PROG_CC_C99 AM_PROG_CC_C_O # Checks for header files. @@ -29,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) @@ -43,15 +45,28 @@ AC_SUBST(GTK_LIBS) # Check JSON JSON_LIBS= PKG_CHECK_MODULES(JSON, - json, - [AC_DEFINE([HAVE_JSON],[1],[Use JSON])], - [AC_MSG_WARN("Remote monitoring disabled, json missing")]) + 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