refactoring and cleanup (#2)

* make hyperion to singelton.
remove arguments for config and hyperion - both are gettable via Hyperion::getInstance

* refactor hyperiond

* remove qt4 comapt
make zeroconf mandatory
refactor hyperiond

* xbmcchecker is now a singleton

* cleanup in hyperiond
zeroconf switchable between static and shared linking

* fix xbmcchecker

libsrc/bonjour/CMakeLists.txt

@@ -19,13 +19,8 @@ set(Bonjour_SOURCES
 set(Bonjour_RESOURCES
 )
 
-if(ENABLE_QT5)
 qt5_wrap_cpp(Bonjour_HEADERS_MOC ${Bonjour_QT_HEADERS})
 qt5_add_resources(Bonjour_RESOURCES_RCC ${Bonjour_RESOURCES} OPTIONS "-no-compress")
-else(ENABLE_QT5)
-qt4_wrap_cpp(Bonjour_HEADERS_MOC ${Bonjour_QT_HEADERS})
-qt4_add_resources(Bonjour_RESOURCES_RCC ${Bonjour_RESOURCES} OPTIONS "-no-compress")
-endif(ENABLE_QT5)
 
 add_library(bonjour
 		${Bonjour_HEADERS}
@@ -36,17 +31,29 @@ add_library(bonjour
 		${Bonjour_RESOURCES_RCC}
 )
 
-if(ENABLE_QT5)
 qt5_use_modules(bonjour Widgets Network)
-endif(ENABLE_QT5)
 
 target_link_libraries(bonjour
+		hyperion
+		hyperion-utils
+        ${QT_LIBRARIES})
+
+set(USE_SHARED_AVAHI_LIBS OFF CACHE BOOL "use avahi libraries from system")
+
+if (USE_SHARED_AVAHI_LIBS)
+	target_link_libraries(bonjour
+		dns_sd
+		avahi-client
+		avahi-common
+		avahi-core
+#		avahi-qt4
+		dbus-1)
+else()
+	target_link_libraries(bonjour
 		libdns_sd.a
 		libavahi-client.a
 		libavahi-common.a
 		libavahi-core.a
-		libavahi-qt4.a
-		libdbus-1.a
-		hyperion
-		hyperion-utils
-        ${QT_LIBRARIES})
+#		libavahi-qt4.a
+		libdbus-1.a)
+endif()

libsrc/bonjour/fortuneserver.pro

@@ -1,15 +0,0 @@
-HEADERS       = server.h \
-                bonjourserviceregister.h
-SOURCES       = server.cpp \
-                main.cpp \
-                bonjourserviceregister.cpp
-QT           += network
-
-!mac:x11:LIBS+=-ldns_sd
-
-win32 {
-    LIBS+=-ldnssd
-    # Add your path to bonjour here.
-    LIBPATH=C:/Temp/mDNSResponder-107.6/mDNSWindows/DLL/Debug
-    INCLUDEPATH += c:/Temp/mDNSResponder-107.6/mDNSShared
-}