Make libido a library, rather than a user-loadable module.

components/Makefile.am

@@ -6,7 +6,6 @@ SUBDIRS = \
 	compat \
 	delegation \
 	demo \
-	ido \
 	ido_log \
 	ido_mysql \
 	livestatus \

components/ido_log/Makefile.am

@@ -34,4 +34,5 @@ libido_log_la_LIBADD = \
 	${top_builddir}/lib/base/libbase.la \
 	${top_builddir}/lib/config/libconfig.la \
 	${top_builddir}/lib/remoting/libremoting.la \
-	${top_builddir}/lib/icinga/libicinga.la
+	${top_builddir}/lib/icinga/libicinga.la \
+	${top_builddir}/lib/ido/libido.la

components/ido_mysql/Makefile.am

@@ -34,4 +34,5 @@ libido_mysql_la_LIBADD = \
 	${top_builddir}/lib/base/libbase.la \
 	${top_builddir}/lib/config/libconfig.la \
 	${top_builddir}/lib/remoting/libremoting.la \
-	${top_builddir}/lib/icinga/libicinga.la
+	${top_builddir}/lib/icinga/libicinga.la \
+	${top_builddir}/lib/ido/libido.la

configure.ac

@@ -122,7 +122,6 @@ components/checker/Makefile
 components/compat/Makefile
 components/delegation/Makefile
 components/demo/Makefile
-components/ido/Makefile
 components/ido_log/Makefile
 components/ido_mysql/Makefile
 components/livestatus/Makefile
@@ -139,6 +138,7 @@ lib/Makefile
 lib/base/Makefile
 lib/config/Makefile
 lib/icinga/Makefile
+lib/ido/Makefile
 lib/python/Makefile
 lib/remoting/Makefile
 test/Makefile

lib/Makefile.am

@@ -6,4 +6,5 @@ SUBDIRS = \
 	config \
 	remoting \
 	icinga \
+	ido \
 	python

lib/ido/Makefile.am

@@ -25,12 +25,10 @@ libido_la_SOURCES = \
 libido_la_CPPFLAGS = \
 	$(LTDLINCL) \
 	$(BOOST_CPPFLAGS) \
-	-I${top_srcdir}/lib \
+	-I${top_srcdir}/lib
-	-I${top_srcdir}/components
 
 libido_la_LDFLAGS = \
 	$(BOOST_LDFLAGS) \
-	-module \
 	-no-undefined \
 	@RELEASE_INFO@ \
 	@VERSION_INFO@

lib/ido/dbconnection.h

@@ -49,9 +49,6 @@ protected:
 private:
 	void Initialize(void);
 
-	static void ObjectRegisteredHandler(const DynamicObject::Ptr& object);
-	static void ObjectUnregisteredHandler(const DynamicObject::Ptr& object);
-
 	std::map<DbObject::Ptr, DbReference> m_References;
 };