Build fix for non-unity builds

diff --git a/lib/base/clicommand.cpp b/lib/base/clicommand.cpp
index 0a5062d9b1a85bb2abcb4f9e4283465c105fbf2c..d4c76988f9970a0048ba71190b403cd3881c3707 100644 (file)
--- a/lib/base/clicommand.cpp
+++ b/lib/base/clicommand.cpp
@@ -19,6 +19,8 @@
 
 #include "base/clicommand.hpp"
 #include "base/logger_fwd.hpp"
+#include "base/type.hpp"
+#include "base/serializer.hpp"
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/trim.hpp>

diff --git a/lib/cli/agentblackandwhitelistcommand.cpp b/lib/cli/agentblackandwhitelistcommand.cpp
index dcc2c54dcfa89050817447187a60d9c653bb070a..02fbc1fc2d7eb984cba82702b6cae747c44c3210 100644 (file)
--- a/lib/cli/agentblackandwhitelistcommand.cpp
+++ b/lib/cli/agentblackandwhitelistcommand.cpp
@@ -26,6 +26,7 @@
 #include <fstream>
 
 using namespace icinga;
+namespace po = boost::program_options;
 
 REGISTER_BLACKANDWHITELIST_CLICOMMAND("whitelist");
 REGISTER_BLACKANDWHITELIST_CLICOMMAND("blacklist");

diff --git a/lib/cli/agentutility.hpp b/lib/cli/agentutility.hpp
index 981e3020abc13cc9a6956d09dbc72762cd808614..845e7754188629415d33a10d6210b34883d17731 100644 (file)
--- a/lib/cli/agentutility.hpp
+++ b/lib/cli/agentutility.hpp
@@ -17,29 +17,30 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-#ifndef AGENTUTILITYCOMMAND_H
-#define AGENTUTILITYCOMMAND_H
+#ifndef AGENTUTILITY_H
+#define AGENTUTILITY_H
+
+#include "base/i2-base.hpp"
+#include "base/value.hpp"
 
 namespace icinga
 {
 
 /**
- * The "pki new-ca" command.
- *
  * @ingroup cli
  */
-class AgentUtility {
-
+class AgentUtility
+{
 public:
-       DECLARE_PTR_TYPEDEFS(AgentUtility);
-
-       void ListAgents(void);
-       bool AddAgent(const String& name);
-       bool RemoveAgent(const String& name);
-       bool SetAgentAttribute(const String& attr, const Value& val);
+       static void ListAgents(void);
+       static bool AddAgent(const String& name);
+       static bool RemoveAgent(const String& name);
+       static bool SetAgentAttribute(const String& attr, const Value& val);
 
+private:
+       AgentUtility(void);
 };
 
 }
 
-#endif /* AGENTUTILITYCOMMAND_H */
+#endif /* AGENTUTILITY_H */

diff --git a/lib/cli/repositoryobjectcommand.cpp b/lib/cli/repositoryobjectcommand.cpp
index 074ba82e7686de3d4e820b30ef65720ab684743d..d0e840722c3ecce478bfb2aeb34e36b1ebd6bde4 100644 (file)
--- a/lib/cli/repositoryobjectcommand.cpp
+++ b/lib/cli/repositoryobjectcommand.cpp
@@ -26,6 +26,7 @@
 #include <fstream>
 
 using namespace icinga;
+namespace po = boost::program_options;
 
 REGISTER_REPOSITORY_CLICOMMAND("Host");
 REGISTER_REPOSITORY_CLICOMMAND("Service");