Fix: Use YAML config by default
Sice the JSON config was added and default, that breaks the
original behavior of taking it from the YAML config, it should
be used by default.
Tested: When `--enable-use_json` was added in phosphor-led-manager_git.bbapped,
the JSON config was used, otherwise, the YAML config was used.
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I599db99c132fbf402a262e0ee04b2ece5efb32da
diff --git a/Makefile.am b/Makefile.am
index 2660b32..7f58aa3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@
manager.cpp \
group.cpp
-if !LED_USE_JSON
+if !WANTS_JSON
BUILT_SOURCES = led-gen.hpp
CLEANFILES = led-gen.hpp
diff --git a/configure.ac b/configure.ac
index 49c1b01..5a9c2e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,8 +74,10 @@
# enable JSON configuration
AC_ARG_ENABLE([use_json],
AS_HELP_STRING([--enable-use_json], [Enable JSON configuration.]))
-AC_DEFINE([LED_USE_JSON],[],[Enable JSON configuration.])
-AM_CONDITIONAL([LED_USE_JSON], [test "x$enable-use_json" == "xyes"])
+AM_CONDITIONAL([WANTS_JSON], [test "x$enable_use_json" == "xyes"])
+AS_IF([test "x$enable_use_json" == "xyes"],
+ AC_DEFINE([LED_USE_JSON],[],[Enable JSON configuration.])
+)
AC_DEFINE(CALLOUT_FWD_ASSOCIATION, "callout", [The name of the callout's forward association.])
AC_DEFINE(CALLOUT_REV_ASSOCIATION, "fault", [The name of the callout's reverse association.])