From 22028eb2107acc13c8da4a9203d3c8c83f5c53f9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Thu, 1 Dec 2011 00:43:11 +0000 Subject: [PATCH] code style comment about sysinfo not available on kfreebsd update NEWS --- NEWS | 3 +++ configure.ac | 2 ++ src/server/server.c | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 1f57c59..61ee159 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,8 @@ * v0.6.2.15 +** psensor-server: function 'sysinfo' is now optionnal to allow + compilation on kfreebsd. It fixes Debian bug #650533. + * v0.6.2.14 ** psensor: support of gtk>=2.18 diff --git a/configure.ac b/configure.ac index 12d201e..51f2670 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,8 @@ AC_FUNC_MALLOC AC_FUNC_REALLOC AC_CHECK_FUNCS([gettimeofday memmove socket strdup strtol]) +# Detects whether the function sysinfo is available +# At least kfreebsd 6.0.3 does not provide it. SYSINFO_FCT= AC_CHECK_FUNC(sysinfo, [SYSINFO_FCT='1' AC_DEFINE([HAVE_SYSINFO_FCT],[1],[Use sysinfo])], diff --git a/src/server/server.c b/src/server/server.c index fbafba5..d55ecf2 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -151,13 +151,10 @@ create_response_api(const char *nurl, char *page = NULL; if (!strcmp(nurl, URL_BASE_API_1_0_SENSORS)) { - page = sensors_to_json_string(server_data.sensors); - #ifdef HAVE_GTOP #ifdef HAVE_SYSINFO_FCT } else if (!strcmp(nurl, URL_API_1_0_SYSINFO)) { - page = sysinfo_to_json_string(&server_data.psysinfo); #endif } else if (!strcmp(nurl, URL_API_1_0_CPU_USAGE)) { -- 2.7.4