From 331bd6a1f5de9a0799c77f4e05010081763a4d50 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Tue, 20 Aug 2019 12:26:47 +0200
Subject: [PATCH] Introduce Configuration::LibDir

---
 config.h.cmake             |  1 +
 icinga-app/icinga.cpp      |  2 ++
 lib/base/configuration.cpp | 11 +++++++++++
 lib/base/configuration.hpp |  4 ++++
 lib/base/configuration.ti  |  5 +++++
 5 files changed, 23 insertions(+)

diff --git a/config.h.cmake b/config.h.cmake
index e15198c27..9fab08b0a 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -21,6 +21,7 @@
 #define ICINGA_SPOOLDIR "${ICINGA2_FULL_SPOOLDIR}"
 #define ICINGA_INITRUNDIR "${ICINGA2_FULL_INITRUNDIR}"
 #define ICINGA_INCLUDECONFDIR "${ICINGA2_FULL_INCLUDEDIR}"
+#define ICINGA_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}"
 #define ICINGA_USER "${ICINGA2_USER}"
 #define ICINGA_GROUP "${ICINGA2_GROUP}"
 #define ICINGA_BUILD_HOST_NAME "${ICINGA2_BUILD_HOST_NAME}"
diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 5d3e3165e..fb0323f72 100644
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -218,6 +218,8 @@ static int Main()
 
 		Configuration::InitRunDir = ICINGA_INITRUNDIR;
 
+		Configuration::LibDir = ICINGA_LIBDIR;
+
 #ifdef _WIN32
 	}
 #endif /* _WIN32 */
diff --git a/lib/base/configuration.cpp b/lib/base/configuration.cpp
index d163937e2..514591ad6 100644
--- a/lib/base/configuration.cpp
+++ b/lib/base/configuration.cpp
@@ -19,6 +19,7 @@ String Configuration::EventEngine;
 String Configuration::IncludeConfDir;
 String Configuration::InitRunDir;
 String Configuration::LogDir;
+String Configuration::LibDir;
 String Configuration::ModAttrPath;
 String Configuration::ObjectsPath;
 String Configuration::PidPath;
@@ -153,6 +154,16 @@ void Configuration::SetInitRunDir(const String& val, bool suppress_events, const
 	HandleUserWrite("InitRunDir", &Configuration::InitRunDir, val, m_ReadOnly);
 }
 
+String Configuration::GetLibDir() const
+{
+	return Configuration::LibDir;
+}
+
+void Configuration::SetLibDir(const String& val, bool suppress_events, const Value& cookie)
+{
+	HandleUserWrite("LibDir", &Configuration::LibDir, val, m_ReadOnly);
+}
+
 String Configuration::GetLogDir() const
 {
 	return Configuration::LogDir;
diff --git a/lib/base/configuration.hpp b/lib/base/configuration.hpp
index 560906596..9987d188f 100644
--- a/lib/base/configuration.hpp
+++ b/lib/base/configuration.hpp
@@ -49,6 +49,9 @@ public:
 	String GetInitRunDir() const override;
 	void SetInitRunDir(const String& value, bool suppress_events = false, const Value& cookie = Empty) override;
 
+	String GetLibDir() const override;
+	void SetLibDir(const String& value, bool suppress_events = false, const Value& cookie = Empty) override;
+
 	String GetLogDir() const override;
 	void SetLogDir(const String& value, bool suppress_events = false, const Value& cookie = Empty) override;
 
@@ -124,6 +127,7 @@ public:
 	static String IncludeConfDir;
 	static String InitRunDir;
 	static String LogDir;
+	static String LibDir;
 	static String ModAttrPath;
 	static String ObjectsPath;
 	static String PidPath;
diff --git a/lib/base/configuration.ti b/lib/base/configuration.ti
index 72fa92dcf..3585f1d30 100644
--- a/lib/base/configuration.ti
+++ b/lib/base/configuration.ti
@@ -59,6 +59,11 @@ abstract class Configuration
 		set;
 	};
 
+	[config, no_storage, virtual] String LibDir {
+		get;
+		set;
+	};
+
 	[config, no_storage, virtual] String LogDir {
 		get;
 		set;
-- 
2.49.0