ensure only allowed gtk headers are included

[psensor.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e3e011d..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.13],[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])
 
@@ -54,12 +54,18 @@ AC_SUBST(XEXT_LIBS)
 
 # Checks GTK
 GTK_LIBS=
-PKG_CHECK_MODULES(GTK, gtk+-3.0,,[AC_MSG_WARN("GTK+ 3 not present")])
+PKG_CHECK_MODULES(GTK,
+                 gtk+-3.0,
+                 [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 )
+   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
+   AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
    AC_SUBST(GTK_CFLAGS)
    AC_SUBST(GTK_LIBS)
 fi
@@ -71,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, 
@@ -170,7 +185,7 @@ AC_ARG_WITH(libatiadl,
 [  --with-libatiadl[=DIR]   use libatiadlxx in DIR],[
                   ATIADL_DIR=${withval}
                   CPPFLAGS="${CPPFLAGS} -I${ATIADL_DIR}/include"
-                  LIBS="$LIBS -L/usr/lib/fglrx"
+                  LIBS="$LIBS -L/usr/lib/fglrx -L/usr/lib64/fglrx -L/usr/lib/catalyst -L/usr/lib64/catalyst"
                  ]
 )
 
@@ -179,7 +194,7 @@ AC_CHECK_HEADERS(adl_defines.h,
                [
                        AC_DEFINE(HAVE_LIBATIADL,1,[libatiadl is available])
                        LIBATIADL_CFLAGS="-I${ATIADL_DIR}/include"
-                       LIBATIADL_LIBS="-L/usr/lib/fglrx -latiadlxx"
+                       LIBATIADL_LIBS="-L/usr/lib/fglrx -L/usr/lib64/fglrx -L/usr/lib/catalyst -L/usr/lib64/catalyst -latiadlxx -ldl"
                ]))
 
 AM_CONDITIONAL(LIBATIADL, test -n "$LIBATIADL_LIBS")
@@ -221,10 +236,7 @@ AC_CONFIG_FILES([
  Makefile
  src/Makefile
  src/glade/Makefile
- src/plib/Makefile
  src/lib/Makefile
- src/unity/Makefile
- src/libpsensor_json/Makefile
  src/server/Makefile
  icons/hicolor/scalable/Makefile
  icons/hicolor/14x14/Makefile