From 6383482793bf693521624778095e70eddb7dae1f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Wed, 14 Dec 2011 00:59:21 +0000 Subject: [PATCH] if atasmart lib is present use src/lib/hdd_atasmart.c instead of src/lib/hdd_hddtemp.c for SMART HD monitoring --- Makefile.in | 2 + config.h.in | 3 + configure | 122 +++++++++++- icons/hicolor/14x14/Makefile.in | 2 + icons/hicolor/16x16/Makefile.in | 2 + icons/hicolor/22x22/Makefile.in | 2 + icons/hicolor/24x24/Makefile.in | 2 + icons/hicolor/32x32/Makefile.in | 2 + icons/hicolor/48x48/Makefile.in | 2 + icons/hicolor/64x64/Makefile.in | 2 + icons/hicolor/scalable/Makefile.in | 2 + icons/ubuntu-mono-dark/apps/22/Makefile.in | 2 + icons/ubuntu-mono-dark/status/22/Makefile.in | 2 + icons/ubuntu-mono-light/status/22/Makefile.in | 2 + po/Makefile.in | 10 +- po/POTFILES.in | 3 +- po/fr.po | 22 +-- po/psensor.pot | 22 +-- po/tr.po | 22 +-- po/zh_CN.po | 22 +-- src/Makefile.in | 2 + src/glade/Makefile.in | 2 + src/lib/Makefile.am | 14 +- src/lib/Makefile.in | 114 +++++++----- src/lib/hdd.c | 256 ------------------------- src/lib/hdd_atasmart.c | 40 ++++ src/lib/hdd_hddtemp.c | 257 ++++++++++++++++++++++++++ src/server/Makefile.in | 2 + tests/Makefile.in | 2 + www/Makefile.in | 2 + 30 files changed, 578 insertions(+), 363 deletions(-) delete mode 100644 src/lib/hdd.c create mode 100644 src/lib/hdd_atasmart.c create mode 100644 src/lib/hdd_hddtemp.c diff --git a/Makefile.in b/Makefile.in index f824f28..1469500 100644 --- a/Makefile.in +++ b/Makefile.in @@ -131,6 +131,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/config.h.in b/config.h.in index 05ed111..8c1b8f7 100644 --- a/config.h.in +++ b/config.h.in @@ -16,6 +16,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H +/* Use libatasmart */ +#undef HAVE_ATASMART + /* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework. */ #undef HAVE_CFLOCALECOPYCURRENT diff --git a/configure b/configure index fa91b4e..36ae99c 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for psensor 0.6.2.15. +# Generated by GNU Autoconf 2.68 for psensor 0.6.2.16. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='psensor' PACKAGE_TARNAME='psensor' -PACKAGE_VERSION='0.6.2.15' -PACKAGE_STRING='psensor 0.6.2.15' +PACKAGE_VERSION='0.6.2.16' +PACKAGE_STRING='psensor 0.6.2.16' PACKAGE_BUGREPORT='jeanfi@gmail.com' PACKAGE_URL='http://wpitchoune.net/psensor' @@ -643,6 +643,10 @@ LIBNOTIFY_FALSE LIBNOTIFY_TRUE LIBNOTIFY_LIBS LIBNOTIFY_CFLAGS +ATASMART_FALSE +ATASMART_TRUE +ATASMART_LIBS +ATASMART_CFLAGS GCONF_LIBS GCONF_CFLAGS GTK_FALSE @@ -799,6 +803,8 @@ GTK_CFLAGS GTK_LIBS GCONF_CFLAGS GCONF_LIBS +ATASMART_CFLAGS +ATASMART_LIBS LIBNOTIFY_CFLAGS LIBNOTIFY_LIBS APPINDICATOR_CFLAGS @@ -1355,7 +1361,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures psensor 0.6.2.15 to adapt to many kinds of systems. +\`configure' configures psensor 0.6.2.16 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1429,7 +1435,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of psensor 0.6.2.15:";; + short | recursive ) echo "Configuration of psensor 0.6.2.16:";; esac cat <<\_ACEOF @@ -1478,6 +1484,10 @@ Some influential environment variables: GCONF_CFLAGS C compiler flags for GCONF, overriding pkg-config GCONF_LIBS linker flags for GCONF, overriding pkg-config + ATASMART_CFLAGS + C compiler flags for ATASMART, overriding pkg-config + ATASMART_LIBS + linker flags for ATASMART, overriding pkg-config LIBNOTIFY_CFLAGS C compiler flags for LIBNOTIFY, overriding pkg-config LIBNOTIFY_LIBS @@ -1567,7 +1577,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -psensor configure 0.6.2.15 +psensor configure 0.6.2.16 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1990,7 +2000,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by psensor $as_me 0.6.2.15, which was +It was created by psensor $as_me 0.6.2.16, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2807,7 +2817,7 @@ fi # Define the identity of the package. PACKAGE='psensor' - VERSION='0.6.2.15' + VERSION='0.6.2.16' cat >>confdefs.h <<_ACEOF @@ -7588,6 +7598,94 @@ fi ### Optional +# check libatasmart + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ATASMART" >&5 +$as_echo_n "checking for ATASMART... " >&6; } + +if test -n "$ATASMART_CFLAGS"; then + pkg_cv_ATASMART_CFLAGS="$ATASMART_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libatasmart\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libatasmart") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ATASMART_CFLAGS=`$PKG_CONFIG --cflags "libatasmart" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ATASMART_LIBS"; then + pkg_cv_ATASMART_LIBS="$ATASMART_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libatasmart\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libatasmart") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ATASMART_LIBS=`$PKG_CONFIG --libs "libatasmart" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ATASMART_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libatasmart" 2>&1` + else + ATASMART_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libatasmart" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ATASMART_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Library atasmart not present\"" >&5 +$as_echo "$as_me: WARNING: \"Library atasmart not present\"" >&2;} +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Library atasmart not present\"" >&5 +$as_echo "$as_me: WARNING: \"Library atasmart not present\"" >&2;} +else + ATASMART_CFLAGS=$pkg_cv_ATASMART_CFLAGS + ATASMART_LIBS=$pkg_cv_ATASMART_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_ATASMART 1" >>confdefs.h + +fi + + if test -n "$ATASMART_LIBS"; then + ATASMART_TRUE= + ATASMART_FALSE='#' +else + ATASMART_TRUE='#' + ATASMART_FALSE= +fi + + + + # Check libnotify LIBNOTIFY_LIBS= @@ -8731,6 +8829,10 @@ if test -z "${GTK_TRUE}" && test -z "${GTK_FALSE}"; then as_fn_error $? "conditional \"GTK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ATASMART_TRUE}" && test -z "${ATASMART_FALSE}"; then + as_fn_error $? "conditional \"ATASMART\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${LIBNOTIFY_TRUE}" && test -z "${LIBNOTIFY_FALSE}"; then as_fn_error $? "conditional \"LIBNOTIFY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -9176,7 +9278,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by psensor $as_me 0.6.2.15, which was +This file was extended by psensor $as_me 0.6.2.16, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9243,7 +9345,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -psensor config.status 0.6.2.15 +psensor config.status 0.6.2.16 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/icons/hicolor/14x14/Makefile.in b/icons/hicolor/14x14/Makefile.in index 1276725..457b3d6 100644 --- a/icons/hicolor/14x14/Makefile.in +++ b/icons/hicolor/14x14/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/hicolor/16x16/Makefile.in b/icons/hicolor/16x16/Makefile.in index 9a66b67..ce9fb4a 100644 --- a/icons/hicolor/16x16/Makefile.in +++ b/icons/hicolor/16x16/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/hicolor/22x22/Makefile.in b/icons/hicolor/22x22/Makefile.in index a680ee5..ce15901 100644 --- a/icons/hicolor/22x22/Makefile.in +++ b/icons/hicolor/22x22/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/hicolor/24x24/Makefile.in b/icons/hicolor/24x24/Makefile.in index b6e396a..2cd4ea6 100644 --- a/icons/hicolor/24x24/Makefile.in +++ b/icons/hicolor/24x24/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/hicolor/32x32/Makefile.in b/icons/hicolor/32x32/Makefile.in index 5aad275..15d1dfc 100644 --- a/icons/hicolor/32x32/Makefile.in +++ b/icons/hicolor/32x32/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/hicolor/48x48/Makefile.in b/icons/hicolor/48x48/Makefile.in index b425cfd..ccf5a00 100644 --- a/icons/hicolor/48x48/Makefile.in +++ b/icons/hicolor/48x48/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/hicolor/64x64/Makefile.in b/icons/hicolor/64x64/Makefile.in index 914c9dc..4c20b79 100644 --- a/icons/hicolor/64x64/Makefile.in +++ b/icons/hicolor/64x64/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/hicolor/scalable/Makefile.in b/icons/hicolor/scalable/Makefile.in index 1986610..e77c20c 100644 --- a/icons/hicolor/scalable/Makefile.in +++ b/icons/hicolor/scalable/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/ubuntu-mono-dark/apps/22/Makefile.in b/icons/ubuntu-mono-dark/apps/22/Makefile.in index e98885c..c5eb11d 100644 --- a/icons/ubuntu-mono-dark/apps/22/Makefile.in +++ b/icons/ubuntu-mono-dark/apps/22/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/ubuntu-mono-dark/status/22/Makefile.in b/icons/ubuntu-mono-dark/status/22/Makefile.in index 8ec144f..b0fb65d 100644 --- a/icons/ubuntu-mono-dark/status/22/Makefile.in +++ b/icons/ubuntu-mono-dark/status/22/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/icons/ubuntu-mono-light/status/22/Makefile.in b/icons/ubuntu-mono-light/status/22/Makefile.in index 78ce328..4dc46d3 100644 --- a/icons/ubuntu-mono-light/status/22/Makefile.in +++ b/icons/ubuntu-mono-light/status/22/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/po/Makefile.in b/po/Makefile.in index c303351..f51539b 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -11,7 +11,7 @@ # Origin: gettext-0.16 PACKAGE = psensor -VERSION = 0.6.2.15 +VERSION = 0.6.2.16 PACKAGE_BUGREPORT = jeanfi@gmail.com SHELL = /bin/sh @@ -21,7 +21,7 @@ srcdir = . top_srcdir = .. -prefix = /usr +prefix = /usr/local exec_prefix = ${prefix} datarootdir = ${prefix}/share datadir = ${datarootdir} @@ -34,12 +34,12 @@ INSTALL_DATA = ${INSTALL} -m 644 # We use $(mkdir_p). # In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as # "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions, -# ${SHELL} /mnt/nfs4/users/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it. +# ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it. # In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake # versions, $(mkinstalldirs) and $(install_sh) are unused. -mkinstalldirs = $(SHELL) ${SHELL} /mnt/nfs4/users/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh -d -install_sh = $(SHELL) ${SHELL} /mnt/nfs4/users/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh +mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh -d +install_sh = $(SHELL) ${SHELL} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh MKDIR_P = /bin/mkdir -p mkdir_p = /bin/mkdir -p diff --git a/po/POTFILES.in b/po/POTFILES.in index a99bf87..cea3885 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,7 +9,8 @@ src/ui_sensorpref.c src/rsensor.c src/server/server.c src/lib/amd.c -src/lib/hdd.c +src/lib/hdd_atasmart.c +src/lib/hdd_hddtemp.c src/lib/log.c src/lib/nvidia.c src/lib/lmsensor.c diff --git a/po/fr.po b/po/fr.po index bbce790..6093b8f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.9\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-01 22:06+0100\n" +"POT-Creation-Date: 2011-12-11 12:29+0100\n" "PO-Revision-Date: 2011-02-07 21:18+0100\n" "Last-Translator: Jean-Philippe Orsini \n" "Language-Team: Oriya\n" @@ -84,7 +84,7 @@ msgstr "%s page d'acceuil: <%s>\n" msgid "Enables debug mode." msgstr "Activée" -#: src/main.c:421 src/server/server.c:352 +#: src/main.c:421 src/server/server.c:354 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Essayez `%s --help' pour plus d'informations.\n" @@ -285,27 +285,27 @@ msgstr "" msgid "HTTP Request: %s\n" msgstr "Requete HTTP: %s\n" -#: src/server/server.c:366 +#: src/server/server.c:368 #, c-format msgid "ERROR: no sensors detected\n" msgstr "ERREUR: Aucune sonde detectee\n" -#: src/server/server.c:373 +#: src/server/server.c:375 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "ERREUR: Echec de la creation du serveur Web\n" -#: src/server/server.c:377 +#: src/server/server.c:379 #, fuzzy, c-format msgid "Web server started on port: %d" msgstr "Server Web demarre sur le port: %d\n" -#: src/server/server.c:378 +#: src/server/server.c:380 #, fuzzy, c-format msgid "WWW directory: %s" msgstr "WWW repertoire: %s\n" -#: src/server/server.c:379 +#: src/server/server.c:381 #, fuzzy, c-format msgid "URL: http://localhost:%d" msgstr "URL: http://localhost:%d\n" @@ -331,22 +331,22 @@ msgid "ERROR: Cannot get the number of adapters!\n" msgstr "" "ERREUR: Impossible de récuperer la valeur de la sous-fonctionnalité %s: %s\n" -#: src/lib/hdd.c:58 +#: src/lib/hdd_hddtemp.c:59 #, fuzzy, c-format msgid "ERROR: hdd fetch, failed to open socket\n" msgstr "ERREUR: hdd_fetch, écher d'ouverture de la socket\n" -#: src/lib/hdd.c:72 +#: src/lib/hdd_hddtemp.c:73 #, fuzzy, c-format msgid "ERROR: hdd fetch, failed to open connection\n" msgstr "ERREUR: hdd_fetch, écher de l'ouverture de la connection\n" -#: src/lib/hdd.c:182 +#: src/lib/hdd_hddtemp.c:183 #, c-format msgid "ERROR: wrong hdd string: %s" msgstr "ERREUR: mauvaise chaine hdd: %s" -#: src/lib/hdd.c:252 +#: src/lib/hdd_hddtemp.c:253 #, c-format msgid "ERROR: wrong hdd string: %s\n" msgstr "ERREUR: mauvaise chaine hdd: %s\n" diff --git a/po/psensor.pot b/po/psensor.pot index 73fbc6a..f47b252 100644 --- a/po/psensor.pot +++ b/po/psensor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-01 22:06+0100\n" +"POT-Creation-Date: 2011-12-11 12:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -72,7 +72,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:421 src/server/server.c:352 +#: src/main.c:421 src/server/server.c:354 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -248,27 +248,27 @@ msgstr "" msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:366 +#: src/server/server.c:368 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:373 +#: src/server/server.c:375 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:377 +#: src/server/server.c:379 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:378 +#: src/server/server.c:380 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:379 +#: src/server/server.c:381 #, c-format msgid "URL: http://localhost:%d" msgstr "" @@ -293,22 +293,22 @@ msgstr "" msgid "ERROR: Cannot get the number of adapters!\n" msgstr "" -#: src/lib/hdd.c:58 +#: src/lib/hdd_hddtemp.c:59 #, c-format msgid "ERROR: hdd fetch, failed to open socket\n" msgstr "" -#: src/lib/hdd.c:72 +#: src/lib/hdd_hddtemp.c:73 #, c-format msgid "ERROR: hdd fetch, failed to open connection\n" msgstr "" -#: src/lib/hdd.c:182 +#: src/lib/hdd_hddtemp.c:183 #, c-format msgid "ERROR: wrong hdd string: %s" msgstr "" -#: src/lib/hdd.c:252 +#: src/lib/hdd_hddtemp.c:253 #, c-format msgid "ERROR: wrong hdd string: %s\n" msgstr "" diff --git a/po/tr.po b/po/tr.po index 79ba44c..a8eee90 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-01 22:06+0100\n" +"POT-Creation-Date: 2011-12-11 12:29+0100\n" "PO-Revision-Date: 2011-04-10 13:11+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -73,7 +73,7 @@ msgstr "%s ana sayfa: <%s>\n" msgid "Enables debug mode." msgstr "" -#: src/main.c:421 src/server/server.c:352 +#: src/main.c:421 src/server/server.c:354 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Daha fazla bilgi için `%s --help' yazın.\n" @@ -253,27 +253,27 @@ msgstr "" msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:366 +#: src/server/server.c:368 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:373 +#: src/server/server.c:375 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:377 +#: src/server/server.c:379 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:378 +#: src/server/server.c:380 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:379 +#: src/server/server.c:381 #, c-format msgid "URL: http://localhost:%d" msgstr "" @@ -298,22 +298,22 @@ msgstr "" msgid "ERROR: Cannot get the number of adapters!\n" msgstr "" -#: src/lib/hdd.c:58 +#: src/lib/hdd_hddtemp.c:59 #, c-format msgid "ERROR: hdd fetch, failed to open socket\n" msgstr "" -#: src/lib/hdd.c:72 +#: src/lib/hdd_hddtemp.c:73 #, c-format msgid "ERROR: hdd fetch, failed to open connection\n" msgstr "" -#: src/lib/hdd.c:182 +#: src/lib/hdd_hddtemp.c:183 #, c-format msgid "ERROR: wrong hdd string: %s" msgstr "" -#: src/lib/hdd.c:252 +#: src/lib/hdd_hddtemp.c:253 #, c-format msgid "ERROR: wrong hdd string: %s\n" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 10b4719..3d0d820 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.6.0.10\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2011-12-01 22:06+0100\n" +"POT-Creation-Date: 2011-12-11 12:29+0100\n" "PO-Revision-Date: 2011-06-06 08:57+0000\n" "Last-Translator: royclark \n" "Language-Team: Chinese (simplified)\n" @@ -75,7 +75,7 @@ msgstr "" msgid "Enables debug mode." msgstr "" -#: src/main.c:421 src/server/server.c:352 +#: src/main.c:421 src/server/server.c:354 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" @@ -255,27 +255,27 @@ msgstr "" msgid "HTTP Request: %s\n" msgstr "" -#: src/server/server.c:366 +#: src/server/server.c:368 #, c-format msgid "ERROR: no sensors detected\n" msgstr "" -#: src/server/server.c:373 +#: src/server/server.c:375 #, c-format msgid "ERROR: Fail to create web server\n" msgstr "" -#: src/server/server.c:377 +#: src/server/server.c:379 #, c-format msgid "Web server started on port: %d" msgstr "" -#: src/server/server.c:378 +#: src/server/server.c:380 #, c-format msgid "WWW directory: %s" msgstr "" -#: src/server/server.c:379 +#: src/server/server.c:381 #, c-format msgid "URL: http://localhost:%d" msgstr "" @@ -300,22 +300,22 @@ msgstr "" msgid "ERROR: Cannot get the number of adapters!\n" msgstr "" -#: src/lib/hdd.c:58 +#: src/lib/hdd_hddtemp.c:59 #, c-format msgid "ERROR: hdd fetch, failed to open socket\n" msgstr "" -#: src/lib/hdd.c:72 +#: src/lib/hdd_hddtemp.c:73 #, c-format msgid "ERROR: hdd fetch, failed to open connection\n" msgstr "" -#: src/lib/hdd.c:182 +#: src/lib/hdd_hddtemp.c:183 #, c-format msgid "ERROR: wrong hdd string: %s" msgstr "" -#: src/lib/hdd.c:252 +#: src/lib/hdd_hddtemp.c:253 #, c-format msgid "ERROR: wrong hdd string: %s\n" msgstr "" diff --git a/src/Makefile.in b/src/Makefile.in index 0760728..2c9d731 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -163,6 +163,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/src/glade/Makefile.in b/src/glade/Makefile.in index 2cadc99..a0ab88f 100644 --- a/src/glade/Makefile.in +++ b/src/glade/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 9c777ca..7082480 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -9,18 +9,26 @@ libpsensor_a_SOURCES = \ color.h color.c \ log.h log.c \ psensor.h psensor.c\ - hdd.h hdd.c\ + hdd.h\ nvidia.h \ lmsensor.h lmsensor.c \ p_io.h p_io.c \ url.c url.h +AM_CPPFLAGS= + +if ATASMART +libpsensor_a_SOURCES += hdd_atasmart.c +LIBS += $(ATASMART_LIBS) +AM_CPPFLAGS += $(ATASMART_CFLAGS) +else +libpsensor_a_SOURCES += hdd_hddtemp.c +endif + if NVIDIA libpsensor_a_SOURCES += nvidia.c endif -AM_CPPFLAGS= - if LIBATIADL LIBS += $(LIBATIADL_LIBS) AM_CPPFLAGS += $(LIBATIADL_CFLAGS) diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 3025977..eb4a824 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -34,17 +34,21 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@NVIDIA_TRUE@am__append_1 = nvidia.c -@LIBATIADL_TRUE@am__append_2 = $(LIBATIADL_LIBS) -@LIBATIADL_TRUE@am__append_3 = $(LIBATIADL_CFLAGS) -@LIBATIADL_TRUE@am__append_4 = amd.c -@LIBATIADL_FALSE@am__append_5 = -pedantic -@GTOP_TRUE@am__append_6 = cpu.c -@GTOP_TRUE@am__append_7 = $(GTOP_LIBS) -@GTOP_TRUE@am__append_8 = $(GTOP_CFLAGS) -@JSON_TRUE@am__append_9 = psensor_json.h psensor_json.c -@JSON_TRUE@am__append_10 = $(JSON_LIBS) -@JSON_TRUE@am__append_11 = $(JSON_CFLAGS) +@ATASMART_TRUE@am__append_1 = hdd_atasmart.c +@ATASMART_TRUE@am__append_2 = $(ATASMART_LIBS) +@ATASMART_TRUE@am__append_3 = $(ATASMART_CFLAGS) +@ATASMART_FALSE@am__append_4 = hdd_hddtemp.c +@NVIDIA_TRUE@am__append_5 = nvidia.c +@LIBATIADL_TRUE@am__append_6 = $(LIBATIADL_LIBS) +@LIBATIADL_TRUE@am__append_7 = $(LIBATIADL_CFLAGS) +@LIBATIADL_TRUE@am__append_8 = amd.c +@LIBATIADL_FALSE@am__append_9 = -pedantic +@GTOP_TRUE@am__append_10 = cpu.c +@GTOP_TRUE@am__append_11 = $(GTOP_LIBS) +@GTOP_TRUE@am__append_12 = $(GTOP_CFLAGS) +@JSON_TRUE@am__append_13 = psensor_json.h psensor_json.c +@JSON_TRUE@am__append_14 = $(JSON_LIBS) +@JSON_TRUE@am__append_15 = $(JSON_CFLAGS) subdir = src/lib DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -61,19 +65,22 @@ ARFLAGS = cru libpsensor_a_AR = $(AR) $(ARFLAGS) libpsensor_a_LIBADD = am__libpsensor_a_SOURCES_DIST = amd.h cpu.h measure.h measure.c \ - color.h color.c log.h log.c psensor.h psensor.c hdd.h hdd.c \ - nvidia.h lmsensor.h lmsensor.c p_io.h p_io.c url.c url.h \ - nvidia.c amd.c cpu.c psensor_json.h psensor_json.c -@NVIDIA_TRUE@am__objects_1 = libpsensor_a-nvidia.$(OBJEXT) -@LIBATIADL_TRUE@am__objects_2 = libpsensor_a-amd.$(OBJEXT) -@GTOP_TRUE@am__objects_3 = libpsensor_a-cpu.$(OBJEXT) -@JSON_TRUE@am__objects_4 = libpsensor_a-psensor_json.$(OBJEXT) + color.h color.c log.h log.c psensor.h psensor.c hdd.h nvidia.h \ + lmsensor.h lmsensor.c p_io.h p_io.c url.c url.h hdd_atasmart.c \ + hdd_hddtemp.c nvidia.c amd.c cpu.c psensor_json.h \ + psensor_json.c +@ATASMART_TRUE@am__objects_1 = libpsensor_a-hdd_atasmart.$(OBJEXT) +@ATASMART_FALSE@am__objects_2 = libpsensor_a-hdd_hddtemp.$(OBJEXT) +@NVIDIA_TRUE@am__objects_3 = libpsensor_a-nvidia.$(OBJEXT) +@LIBATIADL_TRUE@am__objects_4 = libpsensor_a-amd.$(OBJEXT) +@GTOP_TRUE@am__objects_5 = libpsensor_a-cpu.$(OBJEXT) +@JSON_TRUE@am__objects_6 = libpsensor_a-psensor_json.$(OBJEXT) am_libpsensor_a_OBJECTS = libpsensor_a-measure.$(OBJEXT) \ libpsensor_a-color.$(OBJEXT) libpsensor_a-log.$(OBJEXT) \ - libpsensor_a-psensor.$(OBJEXT) libpsensor_a-hdd.$(OBJEXT) \ - libpsensor_a-lmsensor.$(OBJEXT) libpsensor_a-p_io.$(OBJEXT) \ - libpsensor_a-url.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ - $(am__objects_3) $(am__objects_4) + libpsensor_a-psensor.$(OBJEXT) libpsensor_a-lmsensor.$(OBJEXT) \ + libpsensor_a-p_io.$(OBJEXT) libpsensor_a-url.$(OBJEXT) \ + $(am__objects_1) $(am__objects_2) $(am__objects_3) \ + $(am__objects_4) $(am__objects_5) $(am__objects_6) libpsensor_a_OBJECTS = $(am_libpsensor_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -92,6 +99,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -141,7 +150,8 @@ LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ $(am__append_2) $(am__append_7) $(am__append_10) +LIBS = @LIBS@ $(am__append_2) $(am__append_6) $(am__append_11) \ + $(am__append_14) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -233,13 +243,14 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LIBRARIES = libpsensor.a -libpsensor_a_CFLAGS = -Wall -Werror $(am__append_5) +libpsensor_a_CFLAGS = -Wall -Werror $(am__append_9) libpsensor_a_SOURCES = amd.h cpu.h measure.h measure.c color.h color.c \ - log.h log.c psensor.h psensor.c hdd.h hdd.c nvidia.h \ - lmsensor.h lmsensor.c p_io.h p_io.c url.c url.h \ - $(am__append_1) $(am__append_4) $(am__append_6) \ - $(am__append_9) -AM_CPPFLAGS = $(am__append_3) $(am__append_8) $(am__append_11) + log.h log.c psensor.h psensor.c hdd.h nvidia.h lmsensor.h \ + lmsensor.c p_io.h p_io.c url.c url.h $(am__append_1) \ + $(am__append_4) $(am__append_5) $(am__append_8) \ + $(am__append_10) $(am__append_13) +AM_CPPFLAGS = $(am__append_3) $(am__append_7) $(am__append_12) \ + $(am__append_15) EXTRA_DIST = $(libpsensor_a_SOURCES) \ amd.c \ cpu.c \ @@ -296,7 +307,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-amd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-color.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-cpu.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-hdd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-hdd_atasmart.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-hdd_hddtemp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-lmsensor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-log.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpsensor_a-measure.Po@am__quote@ @@ -376,20 +388,6 @@ libpsensor_a-psensor.obj: psensor.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-psensor.obj `if test -f 'psensor.c'; then $(CYGPATH_W) 'psensor.c'; else $(CYGPATH_W) '$(srcdir)/psensor.c'; fi` -libpsensor_a-hdd.o: hdd.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-hdd.o -MD -MP -MF $(DEPDIR)/libpsensor_a-hdd.Tpo -c -o libpsensor_a-hdd.o `test -f 'hdd.c' || echo '$(srcdir)/'`hdd.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_a-hdd.Tpo $(DEPDIR)/libpsensor_a-hdd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hdd.c' object='libpsensor_a-hdd.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-hdd.o `test -f 'hdd.c' || echo '$(srcdir)/'`hdd.c - -libpsensor_a-hdd.obj: hdd.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-hdd.obj -MD -MP -MF $(DEPDIR)/libpsensor_a-hdd.Tpo -c -o libpsensor_a-hdd.obj `if test -f 'hdd.c'; then $(CYGPATH_W) 'hdd.c'; else $(CYGPATH_W) '$(srcdir)/hdd.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_a-hdd.Tpo $(DEPDIR)/libpsensor_a-hdd.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hdd.c' object='libpsensor_a-hdd.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-hdd.obj `if test -f 'hdd.c'; then $(CYGPATH_W) 'hdd.c'; else $(CYGPATH_W) '$(srcdir)/hdd.c'; fi` - libpsensor_a-lmsensor.o: lmsensor.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-lmsensor.o -MD -MP -MF $(DEPDIR)/libpsensor_a-lmsensor.Tpo -c -o libpsensor_a-lmsensor.o `test -f 'lmsensor.c' || echo '$(srcdir)/'`lmsensor.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_a-lmsensor.Tpo $(DEPDIR)/libpsensor_a-lmsensor.Po @@ -432,6 +430,34 @@ libpsensor_a-url.obj: url.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-url.obj `if test -f 'url.c'; then $(CYGPATH_W) 'url.c'; else $(CYGPATH_W) '$(srcdir)/url.c'; fi` +libpsensor_a-hdd_atasmart.o: hdd_atasmart.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-hdd_atasmart.o -MD -MP -MF $(DEPDIR)/libpsensor_a-hdd_atasmart.Tpo -c -o libpsensor_a-hdd_atasmart.o `test -f 'hdd_atasmart.c' || echo '$(srcdir)/'`hdd_atasmart.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_a-hdd_atasmart.Tpo $(DEPDIR)/libpsensor_a-hdd_atasmart.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hdd_atasmart.c' object='libpsensor_a-hdd_atasmart.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-hdd_atasmart.o `test -f 'hdd_atasmart.c' || echo '$(srcdir)/'`hdd_atasmart.c + +libpsensor_a-hdd_atasmart.obj: hdd_atasmart.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-hdd_atasmart.obj -MD -MP -MF $(DEPDIR)/libpsensor_a-hdd_atasmart.Tpo -c -o libpsensor_a-hdd_atasmart.obj `if test -f 'hdd_atasmart.c'; then $(CYGPATH_W) 'hdd_atasmart.c'; else $(CYGPATH_W) '$(srcdir)/hdd_atasmart.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_a-hdd_atasmart.Tpo $(DEPDIR)/libpsensor_a-hdd_atasmart.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hdd_atasmart.c' object='libpsensor_a-hdd_atasmart.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-hdd_atasmart.obj `if test -f 'hdd_atasmart.c'; then $(CYGPATH_W) 'hdd_atasmart.c'; else $(CYGPATH_W) '$(srcdir)/hdd_atasmart.c'; fi` + +libpsensor_a-hdd_hddtemp.o: hdd_hddtemp.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-hdd_hddtemp.o -MD -MP -MF $(DEPDIR)/libpsensor_a-hdd_hddtemp.Tpo -c -o libpsensor_a-hdd_hddtemp.o `test -f 'hdd_hddtemp.c' || echo '$(srcdir)/'`hdd_hddtemp.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_a-hdd_hddtemp.Tpo $(DEPDIR)/libpsensor_a-hdd_hddtemp.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hdd_hddtemp.c' object='libpsensor_a-hdd_hddtemp.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-hdd_hddtemp.o `test -f 'hdd_hddtemp.c' || echo '$(srcdir)/'`hdd_hddtemp.c + +libpsensor_a-hdd_hddtemp.obj: hdd_hddtemp.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-hdd_hddtemp.obj -MD -MP -MF $(DEPDIR)/libpsensor_a-hdd_hddtemp.Tpo -c -o libpsensor_a-hdd_hddtemp.obj `if test -f 'hdd_hddtemp.c'; then $(CYGPATH_W) 'hdd_hddtemp.c'; else $(CYGPATH_W) '$(srcdir)/hdd_hddtemp.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_a-hdd_hddtemp.Tpo $(DEPDIR)/libpsensor_a-hdd_hddtemp.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hdd_hddtemp.c' object='libpsensor_a-hdd_hddtemp.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -c -o libpsensor_a-hdd_hddtemp.obj `if test -f 'hdd_hddtemp.c'; then $(CYGPATH_W) 'hdd_hddtemp.c'; else $(CYGPATH_W) '$(srcdir)/hdd_hddtemp.c'; fi` + libpsensor_a-nvidia.o: nvidia.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libpsensor_a_CFLAGS) $(CFLAGS) -MT libpsensor_a-nvidia.o -MD -MP -MF $(DEPDIR)/libpsensor_a-nvidia.Tpo -c -o libpsensor_a-nvidia.o `test -f 'nvidia.c' || echo '$(srcdir)/'`nvidia.c @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libpsensor_a-nvidia.Tpo $(DEPDIR)/libpsensor_a-nvidia.Po diff --git a/src/lib/hdd.c b/src/lib/hdd.c deleted file mode 100644 index 24e9e8d..0000000 --- a/src/lib/hdd.c +++ /dev/null @@ -1,256 +0,0 @@ -/* - * Copyright (C) 2010-2011 jeanfi@gmail.com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA - */ -#include -#include -#define _(str) gettext(str) - -/* - Following code is based on GNOME sensors applet code hddtemp-plugin.c - see http://sensors-applet.sourceforge.net/ -*/ -#include -#include -#include -#include -#include -#include -#include -#include - -#include "psensor.h" - -#define HDDTEMP_SERVER_IP_ADDRESS "127.0.0.1" -#define HDDTEMP_PORT_NUMBER 7634 -#define HDDTEMP_OUTPUT_BUFFER_LENGTH 4048 - -struct hdd_info { - char *name; - int temp; -}; - -static char *fetch() -{ - int sockfd; - ssize_t n = 1; - int output_length = 0; - char *pc; - char *buffer; - struct sockaddr_in address; - - sockfd = socket(AF_INET, SOCK_STREAM, 0); - if (sockfd == -1) { - fprintf(stderr, _("ERROR: hdd fetch, failed to open socket\n")); - return NULL; - } - - address.sin_family = AF_INET; - address.sin_addr.s_addr = inet_addr(HDDTEMP_SERVER_IP_ADDRESS); - address.sin_port = htons(HDDTEMP_PORT_NUMBER); - - buffer = NULL; - - if (connect(sockfd, - (struct sockaddr *)&address, - (socklen_t) sizeof(address)) == -1) { - fprintf(stderr, - _("ERROR: hdd fetch, failed to open connection\n")); - } else { - buffer = malloc(HDDTEMP_OUTPUT_BUFFER_LENGTH); - - pc = buffer; - while ((n = read(sockfd, - pc, - HDDTEMP_OUTPUT_BUFFER_LENGTH - - output_length)) > 0) { - - output_length += n; - pc = &pc[n]; - } - - buffer[output_length] = '\0'; - } - - close(sockfd); - - return buffer; -} - -static int str_index(char *str, char d) -{ - char *c; - int i; - - if (!str || *str == '\0') - return -1; - - c = str; - - i = 0; - while (*c) { - if (*c == d) - return i; - i++; - c++; - } - - return -1; -} - -static struct psensor * -create_sensor(char *id, char *name, int values_max_length) -{ - return psensor_create(id, name, SENSOR_TYPE_HDD_TEMP, - values_max_length); -} - -static char *next_hdd_info(char *string, struct hdd_info *info) -{ - char *c; - int idx_name_n, i, temp; - - if (!string || strlen(string) <= 5 /* at least 5 pipes */ - || string[0] != '|') - return NULL; - - /* skip first pipe */ - c = string + 1; - - /* name */ - idx_name_n = str_index(c, '|'); - - if (idx_name_n == -1) - return NULL; - c = c + idx_name_n + 1; - - /* skip label */ - i = str_index(c, '|'); - if (i == -1) - return NULL; - c = c + i + 1; - - /* temp */ - i = str_index(c, '|'); - if (i == -1) - return NULL; - temp = atoi(c); - c = c + i + 1; - - /* skip unit */ - i = str_index(c, '|'); - if (i == -1) - return NULL; - c = c + i + 1; - - info->name = malloc(idx_name_n + 1); - strncpy(info->name, string + 1, idx_name_n); - info->name[idx_name_n] = '\0'; - - info->temp = temp; - - return c; -} - -struct psensor **hdd_psensor_list_add(struct psensor **sensors, - int values_max_length) -{ - char *hddtemp_output = fetch(); - char *c; - struct hdd_info info; - struct psensor **result; - - if (!hddtemp_output) - return sensors; - - if (hddtemp_output[0] != '|') { - fprintf(stderr, - _("ERROR: wrong hdd string: %s"), hddtemp_output); - - free(hddtemp_output); - - return sensors; - } - - c = hddtemp_output; - - result = sensors; - - while (c && (c = next_hdd_info(c, &info))) { - struct psensor *sensor; - struct psensor **tmp_sensors; - - char *id = malloc(strlen("hdd ") + strlen(info.name) + 1); - strcpy(id, "hdd "); - strcat(id, info.name); - - sensor = create_sensor(id, info.name, values_max_length); - - tmp_sensors = psensor_list_add(result, sensor); - - if (result != sensors) - free(result); - - result = tmp_sensors; - } - - free(hddtemp_output); - - return result; -} - -static void update(struct psensor **sensors, struct hdd_info *info) -{ - struct psensor **sensor_cur = sensors; - - while (*sensor_cur) { - if ((*sensor_cur)->type == SENSOR_TYPE_HDD_TEMP - && !strcmp((*sensor_cur)->id + 4, info->name)) - psensor_set_current_value(*sensor_cur, - (float)info->temp); - - sensor_cur++; - } -} - -void hdd_psensor_list_update(struct psensor **sensors) -{ - char *hddtemp_output = fetch(); - - if (!hddtemp_output) - return; - - if (hddtemp_output[0] == '|') { - - char *c = hddtemp_output; - struct hdd_info info; - info.name = NULL; - info.temp = 0; - - while (c && (c = next_hdd_info(c, &info))) { - - update(sensors, &info); - - free(info.name); - } - } else { - fprintf(stderr, - _("ERROR: wrong hdd string: %s\n"), hddtemp_output); - } - - free(hddtemp_output); -} diff --git a/src/lib/hdd_atasmart.c b/src/lib/hdd_atasmart.c new file mode 100644 index 0000000..56be1a7 --- /dev/null +++ b/src/lib/hdd_atasmart.c @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2010-2011 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#include +#include +#define _(str) gettext(str) + +#include +#include + +#include "hdd.h" +#include "log.h" + +struct psensor **hdd_psensor_list_add(struct psensor **sensors, + int values_max_length) +{ + + log_debug("hdd_psensor_list_add"); + + return sensors; +} + +void hdd_psensor_list_update(struct psensor **sensors) +{ +} diff --git a/src/lib/hdd_hddtemp.c b/src/lib/hdd_hddtemp.c new file mode 100644 index 0000000..fc408ae --- /dev/null +++ b/src/lib/hdd_hddtemp.c @@ -0,0 +1,257 @@ +/* + * Copyright (C) 2010-2011 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ +#include +#include +#define _(str) gettext(str) + +/* + Following code is based on GNOME sensors applet code hddtemp-plugin.c + see http://sensors-applet.sourceforge.net/ +*/ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "hdd.h" +#include "psensor.h" + +#define HDDTEMP_SERVER_IP_ADDRESS "127.0.0.1" +#define HDDTEMP_PORT_NUMBER 7634 +#define HDDTEMP_OUTPUT_BUFFER_LENGTH 4048 + +struct hdd_info { + char *name; + int temp; +}; + +static char *fetch() +{ + int sockfd; + ssize_t n = 1; + int output_length = 0; + char *pc; + char *buffer; + struct sockaddr_in address; + + sockfd = socket(AF_INET, SOCK_STREAM, 0); + if (sockfd == -1) { + fprintf(stderr, _("ERROR: hdd fetch, failed to open socket\n")); + return NULL; + } + + address.sin_family = AF_INET; + address.sin_addr.s_addr = inet_addr(HDDTEMP_SERVER_IP_ADDRESS); + address.sin_port = htons(HDDTEMP_PORT_NUMBER); + + buffer = NULL; + + if (connect(sockfd, + (struct sockaddr *)&address, + (socklen_t) sizeof(address)) == -1) { + fprintf(stderr, + _("ERROR: hdd fetch, failed to open connection\n")); + } else { + buffer = malloc(HDDTEMP_OUTPUT_BUFFER_LENGTH); + + pc = buffer; + while ((n = read(sockfd, + pc, + HDDTEMP_OUTPUT_BUFFER_LENGTH - + output_length)) > 0) { + + output_length += n; + pc = &pc[n]; + } + + buffer[output_length] = '\0'; + } + + close(sockfd); + + return buffer; +} + +static int str_index(char *str, char d) +{ + char *c; + int i; + + if (!str || *str == '\0') + return -1; + + c = str; + + i = 0; + while (*c) { + if (*c == d) + return i; + i++; + c++; + } + + return -1; +} + +static struct psensor * +create_sensor(char *id, char *name, int values_max_length) +{ + return psensor_create(id, name, SENSOR_TYPE_HDD_TEMP, + values_max_length); +} + +static char *next_hdd_info(char *string, struct hdd_info *info) +{ + char *c; + int idx_name_n, i, temp; + + if (!string || strlen(string) <= 5 /* at least 5 pipes */ + || string[0] != '|') + return NULL; + + /* skip first pipe */ + c = string + 1; + + /* name */ + idx_name_n = str_index(c, '|'); + + if (idx_name_n == -1) + return NULL; + c = c + idx_name_n + 1; + + /* skip label */ + i = str_index(c, '|'); + if (i == -1) + return NULL; + c = c + i + 1; + + /* temp */ + i = str_index(c, '|'); + if (i == -1) + return NULL; + temp = atoi(c); + c = c + i + 1; + + /* skip unit */ + i = str_index(c, '|'); + if (i == -1) + return NULL; + c = c + i + 1; + + info->name = malloc(idx_name_n + 1); + strncpy(info->name, string + 1, idx_name_n); + info->name[idx_name_n] = '\0'; + + info->temp = temp; + + return c; +} + +struct psensor **hdd_psensor_list_add(struct psensor **sensors, + int values_max_length) +{ + char *hddtemp_output = fetch(); + char *c; + struct hdd_info info; + struct psensor **result; + + if (!hddtemp_output) + return sensors; + + if (hddtemp_output[0] != '|') { + fprintf(stderr, + _("ERROR: wrong hdd string: %s"), hddtemp_output); + + free(hddtemp_output); + + return sensors; + } + + c = hddtemp_output; + + result = sensors; + + while (c && (c = next_hdd_info(c, &info))) { + struct psensor *sensor; + struct psensor **tmp_sensors; + + char *id = malloc(strlen("hdd ") + strlen(info.name) + 1); + strcpy(id, "hdd "); + strcat(id, info.name); + + sensor = create_sensor(id, info.name, values_max_length); + + tmp_sensors = psensor_list_add(result, sensor); + + if (result != sensors) + free(result); + + result = tmp_sensors; + } + + free(hddtemp_output); + + return result; +} + +static void update(struct psensor **sensors, struct hdd_info *info) +{ + struct psensor **sensor_cur = sensors; + + while (*sensor_cur) { + if ((*sensor_cur)->type == SENSOR_TYPE_HDD_TEMP + && !strcmp((*sensor_cur)->id + 4, info->name)) + psensor_set_current_value(*sensor_cur, + (float)info->temp); + + sensor_cur++; + } +} + +void hdd_psensor_list_update(struct psensor **sensors) +{ + char *hddtemp_output = fetch(); + + if (!hddtemp_output) + return; + + if (hddtemp_output[0] == '|') { + + char *c = hddtemp_output; + struct hdd_info info; + info.name = NULL; + info.temp = 0; + + while (c && (c = next_hdd_info(c, &info))) { + + update(sensors, &info); + + free(info.name); + } + } else { + fprintf(stderr, + _("ERROR: wrong hdd string: %s\n"), hddtemp_output); + } + + free(hddtemp_output); +} diff --git a/src/server/Makefile.in b/src/server/Makefile.in index ca6c408..a7acca8 100644 --- a/src/server/Makefile.in +++ b/src/server/Makefile.in @@ -98,6 +98,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/tests/Makefile.in b/tests/Makefile.in index 992e7a5..20e46b2 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -50,6 +50,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff --git a/www/Makefile.in b/www/Makefile.in index ecf8913..8845760 100644 --- a/www/Makefile.in +++ b/www/Makefile.in @@ -74,6 +74,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ -- 2.7.4