X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=d032e80fb956bc499c0dcc92367a87c88d3b2e23;hb=b6de13fcb155c076b2a4360ba33bc29a7fdc37ec;hp=e1a85f5f521fd977138582b71b32d3750d67c403;hpb=eb66ac041311800f050c4da845f4e98a97f654cb;p=psensor.git

diff --git a/configure.ac b/configure.ac
index e1a85f5..d032e80 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.9],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [0.6.2.13],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall -Werror gnu])
 
@@ -52,11 +52,23 @@ PKG_CHECK_MODULES(XEXT, xext)
 AC_SUBST(XEXT_CFLAGS)
 AC_SUBST(XEXT_LIBS)
 
-# Checks GTK 
-PKG_CHECK_MODULES(GTK, gtk+-2.0 )
+# Checks GTK
+GTK_LIBS=
+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")
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 
+if test "$GTK_LIBS" == ""; then
+   PKG_CHECK_MODULES(GTK, gtk+-2.0 )
+   AM_CONDITIONAL(GTK, test -n "$GTK_LIBS")
+   AC_SUBST(GTK_CFLAGS)
+   AC_SUBST(GTK_LIBS)
+fi
+
 # Check GCONF
 PKG_CHECK_MODULES(GCONF, gconf-2.0)
 AC_SUBST(GCONF_CFLAGS)
@@ -76,12 +88,19 @@ AC_SUBST(LIBNOTIFY_LIBS)
 
 # Checks AppIndicator 
 APPINDICATOR_LIBS=
-PKG_CHECK_MODULES(APPINDICATOR, 
+
+PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1,
+     [AC_DEFINE([HAVE_APPINDICATOR],[1],[Use AppIndicator3-0.1])],
+     [AC_MSG_WARN(AppIndicator 3-0.1 not present")])
+
+if test "$APPINDICATOR_LIBS" == ""; then
+   PKG_CHECK_MODULES(APPINDICATOR, 
      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])
      ],
      [AC_MSG_WARN(AppIndicator 0.2.9 not present")])
+fi
 
 if test "$APPINDICATOR_LIBS" == ""; then
    PKG_CHECK_MODULES(APPINDICATOR, 
@@ -151,25 +170,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 -L/usr/lib64/fglrx -L/usr/lib/catalyst -L/usr/lib64/catalyst"
+		  ]
+)
+
+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 -L/usr/lib64/fglrx -L/usr/lib/catalyst -L/usr/lib64/catalyst -latiadlxx -ldl"
+		]))
+
+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=
@@ -204,19 +226,21 @@ 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
- 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
+ icons/ubuntu-mono-light/status/22/Makefile
+ icons/ubuntu-mono-dark/apps/22/Makefile
  www/Makefile
  po/Makefile.in
  tests/Makefile