Merge tag 'upstream/1.1.5'

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

diff --git a/configure.ac b/configure.ac
index c81887f..803214d 100644 (file)
--- 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.1],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [1.1.5],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall gnu])
 
@@ -26,15 +26,6 @@ AM_PROG_AR
 AC_PATH_X
 AC_CHECK_HEADERS([stdbool.h])
 
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_SIZE_T
-AC_TYPE_SSIZE_T
-
-# Checks for library functions.
-AC_FUNC_MALLOC
-AC_FUNC_REALLOC
-AC_CHECK_FUNCS([gettimeofday memmove socket strdup strtol])
-
 AM_GNU_GETTEXT_VERSION([0.16])
 AM_GNU_GETTEXT([external])
 
@@ -68,22 +59,32 @@ AM_CONDITIONAL(XEXT, test -n "$XEXT_LIBS")
 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")])
+# Check GTK+ 3.0
+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 "
-# 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)
 AC_SUBST(GTK_LIBS)
 
-### Optional
+# Check udisks2
+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
+# Check libatasmart
 PKG_CHECK_MODULES(ATASMART, libatasmart,
                  [AC_DEFINE([HAVE_ATASMART],[1],[Use libatasmart])],
                          [AC_MSG_WARN("Library atasmart not present")])
@@ -195,7 +196,7 @@ AC_SUBST(UNITY_CFLAGS)
 AC_SUBST(UNITY_LIBS)
 AM_CONDITIONAL(UNITY, test -n "$UNITY_LIBS")
 
-# libatiadl
+# Check libatiadl
 AC_ARG_WITH(libatiadl,
 [  --with-libatiadl[=DIR]   use libatiadlxx in DIR],[
                   ATIADL_DIR=${withval}
@@ -218,7 +219,7 @@ AC_SUBST(LIBATIADL_LIBS)
 
 ############### psensor-server
 
-# libmicrohttpd, mandatory for psensor-server
+# Check libmicrohttpd, mandatory for psensor-server
 LIBMICROHTTPD_LIBS=
 PKG_CHECK_MODULES(LIBMICROHTTPD, 
   libmicrohttpd, 
@@ -228,8 +229,7 @@ AM_CONDITIONAL(LIBMICROHTTPD, test -n "$LIBMICROHTTPD_LIBS")
 AC_SUBST(LIBMICROHTTPD_CFLAGS)
 AC_SUBST(LIBMICROHTTPD_LIBS)
 
-# GTop, optional
-
+# Check gtop2, optional
 AC_ARG_WITH(gtop,
 [  --with-gtop[=yes|no]   use gtop],[
        with_gtop=$withval],[