Introduce Configuration::LibDir

diff --git a/config.h.cmake b/config.h.cmake
index e15198c2757d3a5f0689030edb3ebb52e99fa485..9fab08b0a384b14863446bf928702f9c6277b364 100644 (file)
--- 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 5d3e3165e4091b46d84317143b7cb3b65d03e59b..fb0323f7244a522af2ec08759af07bcdf1a66b89 100644 (file)
--- 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 d163937e2a7b953a6ee520cc60d06f078a5c57ed..514591ad641dc87748a096913bbe54564a151869 100644 (file)
--- 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 560906596ccdcc0d8ec2500a19aeb20ca7686bc7..9987d188fd1e9c3b2db48e21c2d1baa1ba18892b 100644 (file)
--- 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 72fa92dcf27fce00e6ba66a76a915a27d4ac2e95..3585f1d30a062ba1667447f0e46f5236e1b7a6a0 100644 (file)
--- 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;