fxied support of libjson0

diff --git a/NEWS b/NEWS
index ac825cb..90a33e6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 * v0.8.0.2
 
+** GConf2 optional to allow psensor-server compilation without it.
+** Added support of libjson-c.
+
 * v0.8.0.1
 
 ** added AMD GPU usage sensor (Contribution from MestreLion).

diff --git a/README.html b/README.html
index 1f35ebe..cfcd824 100644 (file)
--- a/README.html
+++ b/README.html
@@ -670,7 +670,7 @@ have extracted the ATI ADL SDK. Other steps are indentical.</p></div>
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2013-04-10 22:32:13 CEST\r
+Last updated 2013-05-19 10:52:03 CEST\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/configure b/configure
index 5753ed0..292acd7 100755 (executable)
--- a/configure
+++ b/configure
@@ -8270,7 +8270,7 @@ $as_echo "#define HAVE_JSON 1" >>confdefs.h
 
 fi
 
-if test "JSON_LIBS" == ""; then
+if test "$JSON_LIBS" == ""; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JSON" >&5

diff --git a/configure.ac b/configure.ac
index b9292c7..57ffa42 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,7 @@ PKG_CHECK_MODULES(JSON,
                  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])], 
                  [AC_MSG_WARN("json-c missing")])
 
-if test "JSON_LIBS" == ""; then
+if test "$JSON_LIBS" == ""; then
 PKG_CHECK_MODULES(JSON, 
                  json, 
                  [AC_DEFINE([HAVE_JSON],[1],[Use JSON])

diff --git a/po/Makefile.in b/po/Makefile.in
index 090283d..ccdb387 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -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} /home/jporsini/work/wpitchoune.net/svnpub/psensor/trunk/install-sh does not start with $(SHELL), so we add it.
+# ${SHELL} /home/jporsini/work.local/wpitchoune/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} /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
+mkinstalldirs = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/jporsini/work.local/wpitchoune/svnpub/psensor/trunk/install-sh
 MKDIR_P = /bin/mkdir -p
 mkdir_p = /bin/mkdir -p