X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=90efaf71d59d04e2d5c85a0e825bee7833c5870b;hb=41ee97b68ab2de77f3ce42c5740a3d63dcec52e6;hp=3f448dd63c89386f68ea254b224e9d8597019699;hpb=5f0207df9094c175aa6fc5bfcc3a1c7f9e8e6de2;p=psensor.git

diff --git a/configure.ac b/configure.ac
index 3f448dd..90efaf7 100644
--- 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.8],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [0.6.2.11],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall -Werror gnu])
 
@@ -77,7 +77,7 @@ AC_SUBST(LIBNOTIFY_LIBS)
 # Checks AppIndicator 
 APPINDICATOR_LIBS=
 PKG_CHECK_MODULES(APPINDICATOR, 
-     appindicator-0.1 = 0.2.9 , 
+     appindicator-0.1 <= 0.2.9 , 
      [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator 0.2.9])
       AC_DEFINE([HAVE_APPINDICATOR_029],[1],[Use AppIndicator 0.2.9])
      ],
@@ -151,25 +151,28 @@ AC_SUBST(UNITY_CFLAGS)
 AC_SUBST(UNITY_LIBS)
 AM_CONDITIONAL(UNITY, test -n "$UNITY_LIBS")
 
-############### psensor-server
+# libatiadl
+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"
+		  ]
+)
+
+AC_CHECK_HEADERS(adl_defines.h,
+	AC_CHECK_LIB(atiadlxx,ADL_Main_Control_Refresh,
+		[
+			AC_DEFINE(HAVE_LIBATIADL,1,[libatiadl is available])
+			LIBATIADL_CFLAGS="-I${ATIADL_DIR}/include"
+			LIBATIADL_LIBS="-L/usr/lib/fglrx -latiadlxx"
+		]))
+
+AM_CONDITIONAL(LIBATIADL, test -n "$LIBATIADL_LIBS")
+AC_SUBST(LIBATIADL_CFLAGS)
+AC_SUBST(LIBATIADL_LIBS)
 
-# Checks Lua 5.1 
-LUA_LIBS=
-PKG_CHECK_MODULES(LUA, 
-  lua, 
-  [AC_DEFINE([HAVE_LUA],[1],[Use Lua])], 
-  [AC_MSG_WARN(Lua not present, checks Lua5.1)])
-
-# Ubuntu pkg module is lua5.1 not lua
-if test "$LUA_LIBS" == ""; then
-   PKG_CHECK_MODULES(LUA, 
-     lua5.1, 
-     [AC_DEFINE([HAVE_LUA],[1],[Use Lua5.1])], 
-     [AC_MSG_WARN(Lua5.1 not present, psensor-server will NOT be built")])
-fi
-AM_CONDITIONAL(LUA, test -n "$LUA_LIBS")
-AC_SUBST(LUA_CFLAGS)
-AC_SUBST(LUA_LIBS)
+############### psensor-server
 
 # libmicrohttpd, mandatory for psensor-server
 LIBMICROHTTPD_LIBS=
@@ -209,14 +212,15 @@ AC_CONFIG_FILES([
  src/unity/Makefile
  src/libpsensor_json/Makefile
  src/server/Makefile
- pixmaps/scalable/Makefile
- pixmaps/14x14/Makefile
- pixmaps/16x16/Makefile
- pixmaps/22x22/Makefile
- pixmaps/24x24/Makefile
- pixmaps/32x32/Makefile
- pixmaps/48x48/Makefile
- pixmaps/64x64/Makefile
+ icons/hicolor/scalable/Makefile
+ icons/hicolor/14x14/Makefile
+ icons/hicolor/16x16/Makefile
+ icons/hicolor/22x22/Makefile
+ icons/hicolor/24x24/Makefile
+ icons/hicolor/32x32/Makefile
+ icons/hicolor/48x48/Makefile
+ icons/hicolor/64x64/Makefile
+ icons/ubuntu-mono-dark/status/22/Makefile
  www/Makefile
  po/Makefile.in
  tests/Makefile