X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=5e95bf259fea6e34ceea19c250a340e14792f30c;hb=b30a380c5d45f3b5987d336e3df3226baedfa46b;hp=e37c81eca5b9b2f883d405b9e44b8d790acaee92;hpb=ea29c12a9d1be011c1026b4a5dc545520fcab6a6;p=psensor.git

diff --git a/configure.ac b/configure.ac
index e37c81e..5e95bf2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([psensor], [1.0.1],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [1.1.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall gnu])
 
@@ -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)
 
@@ -70,7 +69,9 @@ AC_SUBST(XEXT_CFLAGS)
 AC_SUBST(XEXT_LIBS)
 
 # Checks GTK+ 3.0
-PKG_CHECK_MODULES(GTK, gtk+-3.0,,[AC_MSG_WARN("gtk missing psensor will not be built")])
+PKG_CHECK_MODULES(GTK,
+		  [gtk+-3.0 >= 3.4],,
+		  [AC_MSG_WARN("gtk missing psensor will not be built")])
 AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
 # ensure that only allowed headers are included
 GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES "
@@ -82,15 +83,15 @@ 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)
+# udisks2
 
-### Optional
+PKG_CHECK_MODULES(LIBUDISKS2,
+		  udisks2,
+		  [AC_DEFINE([HAVE_LIBUDISKS2],[1],[Use libudisks])],
+		  [AC_MSG_WARN("Library udisks2 not present")])
+AM_CONDITIONAL(LIBUDISKS2, test -n "$LIBUDISKS2_LIBS")
+AC_SUBST(LIBUDISKS2_CFLAGS)
+AC_SUBST(LIBUDISKS2_LIBS)
 
 # check libatasmart
 PKG_CHECK_MODULES(ATASMART, libatasmart,
@@ -150,13 +151,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 +282,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")