added icons for appindicator

[psensor.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e1a85f5..90efaf7 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.9],[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])
 
@@ -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