From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Mon, 10 Sep 2012 12:44:54 +0000 (+0200)
Subject: Report version number at startup.
X-Git-Tag: v0.0.1~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b996635a914f9d6a0245e0236fdbc3e1e9ecf22f;p=icinga2

Report version number at startup.
---

diff --git a/icinga-app/icinga.cpp b/icinga-app/icinga.cpp
index 4356cebad..5f4de4dd5 100644
--- a/icinga-app/icinga.cpp
+++ b/icinga-app/icinga.cpp
@@ -21,9 +21,11 @@
 
 #ifndef _WIN32
 #	include "icinga-version.h"
-#	define ICINGA_VERSION GIT_MESSAGE
+#	define ICINGA_VERSION VERSION ", " GIT_MESSAGE
 
 #	include <ltdl.h>
+#else /* _WIN32 */
+#	define ICINGA_VERSION VERSION
 #endif /* _WIN32 */
 
 using namespace icinga;
@@ -49,11 +51,7 @@ int main(int argc, char **argv)
 	 * in the base library. */
 	Application::SetMainThread();
 
-#ifdef _WIN32
-	Logger::Write(LogInformation, "icinga", "Icinga application loader");    
-#else /* _WIN32 */
 	Logger::Write(LogInformation, "icinga", "Icinga application loader (version: " ICINGA_VERSION ")");
-#endif  /* _WIN32 */
 
 	if (argc < 3 || strcmp(argv[1], "-c") != 0) {
 		stringstream msgbuf;