commit 9f044415a21272b554fa7594ade21927154afcb0
author Patrick Venture <venture@google.com> Thu Sep 20 19:49:55 2018 -0700
committer Patrick Venture <venture@google.com> Thu Sep 20 19:51:58 2018 -0700
tree f7f54fb2401c3cac3f8009b04b9963e372d368ef
parent 02c9e040325e0775dc2016d92b06a1cbbd4181b4

build: configureDbus replacing linked objects

The external references to the configurations are provided by the
dbusconfiguration.cpp.  Make including this configured.

Tested: Now platform without dbus configuration properly configures
zone.
Change-Id: I97646141aa5672afaadd5346152dfbb07557b2d9
Signed-off-by: Patrick Venture <venture@google.com>

main.cpp

diff --git a/main.cpp b/main.cpp
index 91e555f..e2672e4 100644
--- a/main.cpp
+++ b/main.cpp
@@ -17,7 +17,6 @@
 #include "config.h"
 
 #include "conf.hpp"
-#include "dbus/dbusconfiguration.hpp"
 #include "interfaces.hpp"
 #include "pid/builder.hpp"
 #include "pid/builderconfig.hpp"
@@ -42,6 +41,10 @@
 #include <unordered_map>
 #include <vector>
 
+#if CONFIGURE_DBUS
+#include "dbus/dbusconfiguration.hpp"
+#endif
+
 /* The YAML converted sensor list. */
 extern std::map<std::string, struct sensor> SensorConfig;
 /* The YAML converted PID list. */
@@ -84,10 +87,11 @@
     }
 
     auto ModeControlBus = sdbusplus::bus::new_default();
-    if (configureDbus)
+#if CONFIGURE_DBUS
     {
         dbus_configuration::init(ModeControlBus);
     }
+#endif
     SensorManager mgmr;
     std::unordered_map<int64_t, std::unique_ptr<PIDZone>> zones;