added missing comma

[psensor-pkg-ubuntu.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 688a351..c81887f 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.69])
-AC_INIT([psensor], [0.8.0.5],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [1.1.1],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
-AM_INIT_AUTOMAKE([-Wall -Werror gnu])
+AM_INIT_AUTOMAKE([-Wall gnu])
 
 AC_CONFIG_SRCDIR([src/ui.c])
 AC_CONFIG_HEADERS([config.h])
@@ -38,9 +38,8 @@ AC_CHECK_FUNCS([gettimeofday memmove socket strdup strtol])
 AM_GNU_GETTEXT_VERSION([0.16])
 AM_GNU_GETTEXT([external])
 
-# Gconf
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-AM_GCONF_SOURCE_2
+# Gsettings
+GLIB_GSETTINGS
 
 ############### common 
 
@@ -51,7 +50,7 @@ AC_SUBST(PTHREAD_LIBS)
 
 # Checks sensors, required by psensor and psensor-server
 AC_CHECK_LIB(sensors, sensors_init)
-AC_CHECK_HEADERS([sensors/sensors.h sensors/errors.h])
+AC_CHECK_HEADERS([sensors/sensors.h sensors/error.h])
 SENSORS_LIBS=-lsensors
 AC_SUBST(SENSORS_LIBS)
 
@@ -82,14 +81,6 @@ GTK_CFLAGS+=" -DGSEAL_ENABLE "
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
-# Check GCONF
-PKG_CHECK_MODULES(GCONF, gconf-2.0,
-                 [AC_DEFINE([HAVE_GCONF2],[1],[Use gconf2])],
-                 [AC_MSG_WARN("gconf2 missing psensor will not be built")])
-AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS")
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-
 ### Optional
 
 # check libatasmart
@@ -150,13 +141,13 @@ AC_SUBST(CURL_LIBS)
 # Check JSON, needed for remote monitoring
 JSON_LIBS=
 PKG_CHECK_MODULES(JSON, 
-                 json-c, 
+                 json-c >= 0.11.99,
                  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])], 
                  [AC_MSG_WARN("json-c missing")])
 
 if test "$JSON_LIBS" == ""; then
 PKG_CHECK_MODULES(JSON, 
-                 json, 
+                 json >= 0.11.99,
                  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])
                   AC_DEFINE([HAVE_JSON_0],[1],[Use JSON0])], 
                  [AC_MSG_WARN("json0 missing")])
@@ -281,6 +272,9 @@ AC_CONFIG_FILES([
 
 AC_CHECK_PROGS([HELP2MAN], [help2man])
 
+AC_CHECK_PROG([ASCIIDOC], [asciidoc], yes)
+AM_CONDITIONAL(ASCIIDOC, test -n "$ASCIIDOC")
+
 AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes)
 AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK")