From acebece38c2c169177bb70e24141e099d873af30 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <wak@google.com>
Date: Thu, 7 Feb 2019 15:15:44 -0800
Subject: Convert host-ipmid -> libipmid

phosphor-host-ipmid now exposes a library along with headers for
interfacing with the ipmi daemon. Compile and link against the new
library.

Change-Id: I663e6607f711bc8bae0a2127db524868f6d4cc32
Signed-off-by: William A. Kennington III <wak@google.com>
---
 Makefile.am  | 2 ++
 configure.ac | 8 +++++---
 ipmi.hpp     | 2 +-
 main.cpp     | 8 ++++----
 manager.hpp  | 2 +-
 process.hpp  | 2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1008449..3b57953 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,7 @@ libblobcmds_la_LDFLAGS = \
 	$(SYSTEMD_LIBS) \
 	$(LIBADD_DLOPEN) \
 	$(PHOSPHOR_LOGGING_LIBS) \
+	$(LIBIPMID_LIBS) \
 	-lstdc++fs \
 	-export-dynamic \
 	-version-info 0:0:0 -shared
@@ -24,6 +25,7 @@ libblobcmds_la_LDFLAGS = \
 libblobcmds_la_CXXFLAGS = \
 	$(SYSTEMD_CFLAGS) \
 	$(PHOSPHOR_LOGGING_CFLAGS) \
+	$(LIBIPMID_CFLAGS) \
 	-flto
 
 nobase_include_HEADERS = \
diff --git a/configure.ac b/configure.ac
index 7fb93d5..ebd6a70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,9 +28,11 @@ PKG_CHECK_MODULES(
     [],
     [AC_MSG_ERROR([Could not find phosphor-logging...openbmc/phosphor-logging package required])]
 )
-AC_CHECK_HEADER(
-    [host-ipmid],
-    [AC_MSG_ERROR(["phosphor-host-ipmid required and not found."])]
+PKG_CHECK_MODULES(
+    [LIBIPMID],
+    [libipmid],
+    [],
+    [AC_MSG_ERROR([Could not find libipmid...openbmc/phosphor-host-ipmid package required])]
 )
 AC_CHECK_HEADER(
     experimental/filesystem,
diff --git a/ipmi.hpp b/ipmi.hpp
index db77836..b79b1ee 100644
--- a/ipmi.hpp
+++ b/ipmi.hpp
@@ -2,7 +2,7 @@
 
 #include "manager.hpp"
 
-#include <host-ipmid/ipmid-api.h>
+#include <ipmid/api.h>
 
 #include <blobs-ipmid/blobs.hpp>
 #include <string>
diff --git a/main.cpp b/main.cpp
index dd755e6..6115302 100644
--- a/main.cpp
+++ b/main.cpp
@@ -21,12 +21,12 @@
 #include "process.hpp"
 #include "utils.hpp"
 
-#include <host-ipmid/ipmid-api.h>
+#include <ipmid/api.h>
 
 #include <cstdio>
-#include <host-ipmid/iana.hpp>
-#include <host-ipmid/oemopenbmc.hpp>
-#include <host-ipmid/oemrouter.hpp>
+#include <ipmid/iana.hpp>
+#include <ipmid/oemopenbmc.hpp>
+#include <ipmid/oemrouter.hpp>
 #include <memory>
 #include <phosphor-logging/log.hpp>
 
diff --git a/manager.hpp b/manager.hpp
index c0c4249..4caf4ea 100644
--- a/manager.hpp
+++ b/manager.hpp
@@ -2,7 +2,7 @@
 
 #include <blobs-ipmid/blobs.hpp>
 #include <ctime>
-#include <host-ipmid/oemrouter.hpp>
+#include <ipmid/oemrouter.hpp>
 #include <memory>
 #include <string>
 #include <unordered_map>
diff --git a/process.hpp b/process.hpp
index af19b22..390bc1a 100644
--- a/process.hpp
+++ b/process.hpp
@@ -3,7 +3,7 @@
 #include "crc.hpp"
 #include "manager.hpp"
 
-#include <host-ipmid/ipmid-api.h>
+#include <ipmid/api.h>
 
 #include <functional>
 
-- 
cgit v1.2.3