X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=9b703afad2bb2ed14c828c567dda6adde029cd36;hb=bedf8ee232e1617cd8f25047471bdea598f3bc00;hp=01e5ca5fb91af8d987fe8a8d37090212228a2fa1;hpb=ba380f4d3df284bca4ccc96467e6c6acc2e2cb1b;p=psensor.git diff --git a/configure.ac b/configure.ac index 01e5ca5..9b703af 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.10],[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=