Removed autogenerated file (config.h.in)

Updated version output for icinga component loader
Updated project file

diff --git a/config.h.in b/config.h.in
deleted file mode 100644 (file)
index 423fcf8..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,62 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION

diff --git a/icinga/icingaapplication.cpp b/icinga/icingaapplication.cpp
index a3716a32dad1ab80c82f784e1e50671dfc3fe9c9..f9a9ffac23256e37e0c6bf0a9f381a0d39cd5136 100644 (file)
--- a/icinga/icingaapplication.cpp
+++ b/icinga/icingaapplication.cpp
@@ -2,9 +2,7 @@
 #include <iostream>
 #include "i2-icinga.h"
 
-#ifdef _WIN32
-#      define ICINGA_VERSION "N/A"
-#else /* _WIN32 */
+#ifndef _WIN32
 #      include "icinga-version.h"
 #      define ICINGA_VERSION GIT_MESSAGE
 #endif /* _WIN32 */
@@ -21,12 +19,19 @@ IcingaApplication::IcingaApplication(void)
 
 int IcingaApplication::Main(const vector<string>& args)
 {
+#ifdef _WIN32
+       cout << "Icinga component loader" << endl;
+#else /* _WIN32 */
+       cout << "Icinga component loader (version: " << ICINGA_VERSION << ")" << endl;
+#endif  /* _WIN32 */
+
        GetConfigHive()->OnObjectCreated.bind(bind_weak(&IcingaApplication::ConfigObjectCreatedHandler, shared_from_this()));
        GetConfigHive()->OnObjectRemoved.bind(bind_weak(&IcingaApplication::ConfigObjectRemovedHandler, shared_from_this()));
 
        ConfigObject::RefType fileComponentConfig = new_object<ConfigObject>();
        fileComponentConfig->SetName("configfilecomponent");
        fileComponentConfig->SetType("component");
+       fileComponentConfig->SetProperty("path", "libconfigfilecomponent.la");
        fileComponentConfig->SetProperty("filename", "icinga.conf");
        GetConfigHive()->AddObject(fileComponentConfig);
 

diff --git a/icinga2.sln b/icinga2.sln
index d21756d1efcfdab1bf2a9250089c785cadc99609..cfe447411786f83b324fafacaf7050c35ad19c71 100644 (file)
--- a/icinga2.sln
+++ b/icinga2.sln
@@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "base\base.vcxproj", "{9C92DA90-FD53-43A9-A244-90F2E8AF9677}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniapp", "miniapp\miniapp.vcxproj", "{7CEA8AB1-3327-4644-9D38-B639A8F3341E}"
-       ProjectSection(ProjectDependencies) = postProject
-               {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
-               {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8} = {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}
-       EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsonrpc", "jsonrpc\jsonrpc.vcxproj", "{8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}"
        ProjectSection(ProjectDependencies) = postProject
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677} = {9C92DA90-FD53-43A9-A244-90F2E8AF9677}
@@ -49,10 +43,6 @@ Global
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Debug|Win32.Build.0 = Debug|Win32
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.ActiveCfg = Release|Win32
                {9C92DA90-FD53-43A9-A244-90F2E8AF9677}.Release|Win32.Build.0 = Release|Win32
-               {7CEA8AB1-3327-4644-9D38-B639A8F3341E}.Debug|Win32.ActiveCfg = Debug|Win32
-               {7CEA8AB1-3327-4644-9D38-B639A8F3341E}.Debug|Win32.Build.0 = Debug|Win32
-               {7CEA8AB1-3327-4644-9D38-B639A8F3341E}.Release|Win32.ActiveCfg = Release|Win32
-               {7CEA8AB1-3327-4644-9D38-B639A8F3341E}.Release|Win32.Build.0 = Release|Win32
                {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win32.ActiveCfg = Debug|Win32
                {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Debug|Win32.Build.0 = Debug|Win32
                {8DD52FAC-ECEE-48C2-B266-E7C47ED485F8}.Release|Win32.ActiveCfg = Release|Win32