commit cc194809f96fb59b982175ed330f6bbc9a9d3647
author Matthew Barth <msbarth@us.ibm.com> Thu Jan 09 13:55:34 2020 -0600
committer Matthew Barth <msbarth@us.ibm.com> Mon Jan 13 13:47:26 2020 -0600
tree a90fbea90bf79e038bdd9ebfcb2c8d01a56f4ea2
parent 5060b101dbd0ac002056e7277d9cbfe8c42b7b97

presence: Enable use of JSON instead of YAML

When `--enable-json` is given at configure time, JSON runtime
configuration is used otherwise the default is to use YAML build time
configuration.

Tested:
    JSON used at runtime when `--enable-json` given at configure time
    generated.hpp not created when using JSON
    generated.hpp created by default when using YAML at build time

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

configure.ac

diff --git a/configure.ac b/configure.ac
index 238ee54..3bbdfce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,8 @@
     AC_SUBST([OESDK_TESTCASE_FLAGS], [$testcase_flags])
 )
 
+AC_ARG_ENABLE([json],
+    AS_HELP_STRING([--enable-json], [Use json at runtime to configure fan packages.]))
 AC_ARG_ENABLE([presence],
     AS_HELP_STRING([--disable-presence], [Disable fan presence package.]))
 AC_ARG_ENABLE([control],
@@ -67,6 +69,7 @@
 AC_ARG_ENABLE([monitor],
     AS_HELP_STRING([--disable-monitor], [Disable monitor]))
 
+AM_CONDITIONAL([WANT_JSON], [test "x$enable_json" == "xyes"])
 AM_CONDITIONAL([WANT_PRESENCE], [test "x$enable_presence" != "xno"])
 AM_CONDITIONAL([WANT_CONTROL], [test "x$enable_control" != "xno"])
 AM_CONDITIONAL([WANT_COOLING_TYPE], [test "x$enable_cooling_type" != "xno"])
@@ -74,9 +77,18 @@
 
 # Package specific checks.
 AS_IF([test "x$enable_presence" != "xno"], [
-       # Add optional yaml file argument
-       AC_ARG_VAR(PRESENCE_CONFIG,
-                  [The fan presence config file.])
+    # 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([PRESENCE_USE_JSON], [1], [Fan presence use runtime json configuration])
+        AC_MSG_NOTICE([Fan presence json configuration usage enabled])
+    ],
+    [
+        # Add optional yaml file argument
+        AC_ARG_VAR(PRESENCE_CONFIG, [The fan presence config file.])
 
        AS_IF([test "x$PRESENCE_CONFIG" == "x"],
              [PRESENCE_CONFIG="\${top_srcdir}/presence/example/example.yaml"])
@@ -86,9 +98,9 @@
 
        AC_SUBST([PFPGEN],
                 ["$PYTHON \${top_srcdir}/presence/pfpgen.py generate-cpp -i $PRESENCE_CONFIG"])
-
-       AC_CONFIG_FILES([presence/Makefile])
-       ])
+    ])
+    AC_CONFIG_FILES([presence/Makefile])
+])
 
 AS_IF([test "x$enable_control" != "xno"], [
        # Add fan control Dbus attributes