# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([psensor], [0.8.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [1.1.0],[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])
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
# 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)
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
# 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")])
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")