ensure only allowed gtk headers are included

[psensor.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a09f48c..cf4a175 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.64])
-AC_INIT([psensor], [0.6.2.14],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [0.7.0.0],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall -Werror gnu])
 
@@ -59,11 +59,12 @@ PKG_CHECK_MODULES(GTK,
                  [AC_DEFINE([HAVE_GTK3],[1],[Use GTK3])],
                  [AC_MSG_WARN("GTK+ 3 not present")])
 AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
+GTK_CFLAGS+=-DGTK_DISABLE_SINGLE_INCLUDES
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
 if test "$GTK_LIBS" == ""; then
-   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.22)
+   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
    AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
    AC_SUBST(GTK_CFLAGS)
    AC_SUBST(GTK_LIBS)
@@ -76,6 +77,15 @@ AC_SUBST(GCONF_LIBS)
 
 ### Optional
 
+# check libatasmart
+PKG_CHECK_MODULES(ATASMART, libatasmart,
+                 [AC_DEFINE([HAVE_ATASMART],[1],[Use libatasmart])],
+                         [AC_MSG_WARN("Library atasmart not present")])
+
+AM_CONDITIONAL(ATASMART, test -n "$ATASMART_LIBS")
+AC_SUBST(ATASMART_CFLAGS)
+AC_SUBST(ATASMART_LIBS)
+
 # Check libnotify
 LIBNOTIFY_LIBS=
 PKG_CHECK_MODULES(LIBNOTIFY,