fixed compilation with AMD/ATI GPU monitoring support(submitted by Lubos Stanek).

diff --git a/NEWS b/NEWS
index 25c87bc..d369437 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,8 @@
 ** psensor: fixed compilation with libnotify 0.5.2 (submitted by Lubos
    Stanek).
 ** psensor: added missing CPPFLAGS for Gtop (submitted by Lubos Stanek).
+** psensor: fixed compilation with AMD/ATI GPU monitoring support
+   (submitted by Lubos Stanek).
 
 * v0.6.2.12
 ** psensor: added -d option to enable debug log (written to $HOME/.psensor/log).

diff --git a/configure b/configure
index 6381d05..b221d27 100755 (executable)
--- a/configure
+++ b/configure
@@ -8264,7 +8264,7 @@ if test "${with_libatiadl+set}" = set; then :
   withval=$with_libatiadl;
                   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"
 
 
 fi
@@ -8319,7 +8319,7 @@ if test "x$ac_cv_lib_atiadlxx_ADL_Main_Control_Refresh" = xyes; then :
 $as_echo "#define HAVE_LIBATIADL 1" >>confdefs.h
 
                        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"
 
 fi
 

diff --git a/configure.ac b/configure.ac
index dd68666..ccce11f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -175,7 +175,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"
                  ]
 )
 
@@ -184,7 +184,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")

diff --git a/po/Makefile.in b/po/Makefile.in
index f901ffc..8b758af 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -21,7 +21,7 @@ srcdir = .
 top_srcdir = ..
 
 
-prefix = /tmp/r
+prefix = /usr/local
 exec_prefix = ${prefix}
 datarootdir = ${prefix}/share
 datadir = ${datarootdir}

diff --git a/src/Makefile.am b/src/Makefile.am
index a4b9fe6..8a1c982 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,6 +63,11 @@ AM_CPPFLAGS += $(NVIDIA_CFLAGS)
 LIBS +=  $(NVIDIA_LIBS)
 endif
 
+if LIBATIADL
+AM_CPPFLAGS += $(LIBATIADL_CFLAGS)
+LIBS += $(LIBATIADL_LIBS)
+endif
+
 if UNITY
 AM_CPPFLAGS += $(UNITY_CFLAGS)
 LIBS += unity/libpsensor_unity.a $(UNITY_LIBS) 

diff --git a/src/Makefile.in b/src/Makefile.in
index 85811b9..925eb81 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -47,11 +47,13 @@ bin_PROGRAMS = psensor$(EXEEXT)
 @APPINDICATOR_TRUE@am__append_10 = $(APPINDICATOR_CFLAGS)
 @NVIDIA_TRUE@am__append_11 = $(NVIDIA_CFLAGS)
 @NVIDIA_TRUE@am__append_12 = $(NVIDIA_LIBS)
-@UNITY_TRUE@am__append_13 = $(UNITY_CFLAGS)
-@UNITY_TRUE@am__append_14 = unity/libpsensor_unity.a $(UNITY_LIBS) 
-@CURL_TRUE@@JSON_TRUE@am__append_15 = rsensor.h rsensor.c plib/url.c plib/url.h
-@CURL_TRUE@@JSON_TRUE@am__append_16 = $(CURL_LIBS) $(JSON_LIBS)
-@CURL_TRUE@@JSON_TRUE@am__append_17 = $(CURL_CFLAGS) $(JSON_CFLAGS)
+@LIBATIADL_TRUE@am__append_13 = $(LIBATIADL_CFLAGS)
+@LIBATIADL_TRUE@am__append_14 = $(LIBATIADL_LIBS)
+@UNITY_TRUE@am__append_15 = $(UNITY_CFLAGS)
+@UNITY_TRUE@am__append_16 = unity/libpsensor_unity.a $(UNITY_LIBS) 
+@CURL_TRUE@@JSON_TRUE@am__append_17 = rsensor.h rsensor.c plib/url.c plib/url.h
+@CURL_TRUE@@JSON_TRUE@am__append_18 = $(CURL_LIBS) $(JSON_LIBS)
+@CURL_TRUE@@JSON_TRUE@am__append_19 = $(CURL_CFLAGS) $(JSON_CFLAGS)
 subdir = src
 DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in
@@ -212,7 +214,7 @@ LIBOBJS = @LIBOBJS@
 LIBS = plib/libplib.a lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) \
        $(SENSORS_LIBS) $(am__append_4) $(am__append_6) \
        $(am__append_9) $(am__append_12) $(am__append_14) \
-       $(am__append_16)
+       $(am__append_16) $(am__append_18)
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -310,12 +312,13 @@ AM_CPPFLAGS = -Wall -pedantic -Werror \
        -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \
        $(GTK_CFLAGS) $(GCONF_CFLAGS) $(SENSORS_CFLAGS) \
        $(am__append_3) $(am__append_7) $(am__append_10) \
-       $(am__append_11) $(am__append_13) $(am__append_17)
+       $(am__append_11) $(am__append_13) $(am__append_15) \
+       $(am__append_19)
 psensor_SOURCES = compat.h cfg.h cfg.c graph.h graph.c main.c ui.h \
        ui.c ui_color.h ui_color.c ui_graph.h ui_graph.c ui_pref.h \
        ui_pref.c ui_sensorlist.h ui_sensorlist.c ui_sensorpref.h \
        ui_sensorpref.c $(am__append_5) $(am__append_8) \
-       $(am__append_15)
+       $(am__append_17)
 dist_man_MANS = psensor.1
 EXTRA_DIST = description.txt
 all: all-recursive