X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=add0c4e137f8744d667282c4c837050537755b7b;hb=7235ccd223c57e24cd965a65b9c4ca41132c943b;hp=6ce3fbda823a321cc796e9b5c589c5beb84ad471;hpb=24ab97d635e83e919877fed0763b7ddb24cbc3e1;p=psensor.git

diff --git a/configure.ac b/configure.ac
index 6ce3fbd..add0c4e 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.1.0.x],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [1.2.0],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall gnu])
 
@@ -40,9 +40,11 @@ PTHREAD_LIBS=-pthread
 AC_SUBST(PTHREAD_LIBS)
 
 # Checks sensors, required by psensor and psensor-server
-AC_CHECK_LIB(sensors, sensors_init)
+AC_CHECK_LIB(sensors, sensors_init,
+             [SENSORS_LIBS=-lsensors
+	      AC_DEFINE([HAVE_LIBSENSORS],[1],[Use libsensors])])
 AC_CHECK_HEADERS([sensors/sensors.h sensors/error.h])
-SENSORS_LIBS=-lsensors
+AM_CONDITIONAL(SENSORS, test -n "$SENSORS_LIBS")
 AC_SUBST(SENSORS_LIBS)
 
 ############### psensor 
@@ -66,9 +68,10 @@ PKG_CHECK_MODULES(GTK,
 AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
 # ensure that only allowed headers are included
 GTK_CFLAGS+=" -DGTK_DISABLE_SINGLE_INCLUDES "
-# ensure that no gtk deprecated symbols are used
+# ensure that no gtk/dk deprecated symbols are used
 GTK_CFLAGS+=" -DGDK_DISABLE_DEPRECATED "
-GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
+# do not enable flag because GtkStatusIcon is deprecated
+#GTK_CFLAGS+=" -DGTK_DISABLE_DEPRECATED "
 # ensure use of accessors
 GTK_CFLAGS+=" -DGSEAL_ENABLE "
 AC_SUBST(GTK_CFLAGS)
@@ -253,6 +256,7 @@ AC_CONFIG_FILES([
 ])
 
 AC_CHECK_PROGS([HELP2MAN], [help2man])
+AM_CONDITIONAL(HELP2MAN, test -n "$HELP2MAN")
 
 AC_CHECK_PROG([ASCIIDOC], [asciidoc], yes)
 AM_CONDITIONAL(ASCIIDOC, test -n "$ASCIIDOC")