commit bedefd80f27c81c63cf3f5a0fa59f63713987936
author Matthew Barth <msbarth@us.ibm.com> Tue Jun 02 15:39:56 2020 -0500
committer Matthew Barth <msbarth@us.ibm.com> Thu Jun 18 13:24:26 2020 -0500
tree 307ad36740bfbbb689c0a95a367a1bbf2ef9e763
parent 3ad14346fb4f6abfbb361a2a714cc626e9e82f4c

monitor:JSON: Enable JSON configuration file usage

Add the support to enable the use of a JSON configuration file at
configure time using the same `enable_json` flag along with the
appropriate makefile attributes to compile in the JSON configuration
file support.

Tested:
    `--enable-json` configure flag enables use of JSON in place of YAML
    YAML build time configuration used when `--enable-json` not given
    JSON configuration file loaded/parsed/used when enabled

Change-Id: Ie869b245df533d2a3656543f8ce370d9d24cf4ce
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>

configure.ac

diff --git a/configure.ac b/configure.ac
index e481e80..4e89854 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,20 +163,30 @@
 AS_IF([test "x$enable_cooling_type" != "xno"], [
        AC_CONFIG_FILES([cooling-type/Makefile])
 ])
+
 AS_IF([test "x$enable_monitor" != "xno"], [
+    # Use runtime(json) config, otherwise default to compile time(yaml) config
+    AM_COND_IF([WANT_JSON],
+    [
+        AC_CHECK_HEADER(nlohmann/json.hpp, ,
+                [AC_MSG_ERROR([Could not find nlohmann/json.hpp... nlohmann/json package required])])
+        # Set config flag for runtime json usage
+        AC_DEFINE([MONITOR_USE_JSON], [1], [Fan monitor use runtime json configuration])
+        AC_MSG_NOTICE([Fan monitor json configuration usage enabled])
+    ],
+    [
+        AC_ARG_VAR(FAN_MONITOR_YAML_FILE,
+                   [The fan monitor definition file to use])
+        AS_IF([test "x$FAN_MONITOR_YAML_FILE" == "x"],
+              [FAN_MONITOR_YAML_FILE="\${top_srcdir}/monitor/example/monitor.yaml"])
+        AC_DEFINE_UNQUOTED([FAN_MONITOR_YAML_FILE], ["$FAN_MONITOR_YAML_FILE"],
+                           [The fan monitor definition file to use])
 
-       AC_ARG_VAR(FAN_MONITOR_YAML_FILE,
-                  [The fan monitor definition file to use])
-       AS_IF([test "x$FAN_MONITOR_YAML_FILE" == "x"],
-             [FAN_MONITOR_YAML_FILE="\${top_srcdir}/monitor/example/monitor.yaml"])
-       AC_DEFINE_UNQUOTED([FAN_MONITOR_YAML_FILE], ["$FAN_MONITOR_YAML_FILE"],
-                          [The fan monitor definition file to use])
-
-       AC_SUBST([GEN_FAN_MONITOR_DEFS],
-                ["$PYTHON \${top_srcdir}/monitor/gen-fan-monitor-defs.py \
-                         -m $FAN_MONITOR_YAML_FILE"])
-
-       AC_CONFIG_FILES([monitor/Makefile])
+        AC_SUBST([GEN_FAN_MONITOR_DEFS],
+                 ["$PYTHON \${top_srcdir}/monitor/gen-fan-monitor-defs.py \
+                  -m $FAN_MONITOR_YAML_FILE"])
+    ])
+    AC_CONFIG_FILES([monitor/Makefile])
 ])
 
 # Create configured output