summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-01-12 15:45:34 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-01-12 15:45:34 +0100
commit281e2da7f14eca57104dbd3f7da39506011729a8 (patch)
tree6612dbbe6236b3871a9a436f5c90b07df5c913d9
parentaca6b3d42409234a19e2910443d511328c0b025a (diff)
downloadtdelibs-281e2da7.zip
tdelibs-281e2da7.tar.gz
Fix building with avahi support
+ Avahi detection was not performed at all + Added missing avahi-client detection + Fixed FTBFS in avahi related code Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--CMakeLists.txt19
-rw-r--r--config.h.cmake1
-rw-r--r--dnssd/CMakeLists.txt2
-rw-r--r--dnssd/publicservice.cpp2
4 files changed, 12 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a35aa8b..36a7e80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1096,16 +1096,15 @@ endif( WITH_LUA )
##### check for avahi ###########################
if( WITH_AVAHI )
- if( WITH_QT4 )
- endif( WITH_QT4 )
-
- if( WITH_QT3 )
- pkg_search_module( AVAHI avahi-tqt )
- if( NOT AVAHI_FOUND )
- message(FATAL_ERROR "\navahi support are requested, but not found on your system" )
- endif( NOT AVAHI_FOUND )
- set( AVAHI_API_0_6 1 )
- endif( WITH_QT3 )
+ pkg_search_module( AVAHI_TQT avahi-tqt )
+ pkg_search_module( AVAHI_CLIENT avahi-client )
+ if( NOT AVAHI_TQT_FOUND OR NOT AVAHI_CLIENT_FOUND )
+ tde_message_fatal( "avahi support is requested, but not found on your system" )
+ endif( NOT AVAHI_TQT_FOUND OR NOT AVAHI_CLIENT_FOUND )
+ if( NOT AVAHI_CLIENT_VERSION VERSION_LESS "0.6" )
+ set( AVAHI_API_0_6 1 )
+ endif( )
+ set( HAVE_DNSSD 1 )
endif( )
diff --git a/config.h.cmake b/config.h.cmake
index da39e99..5ee6f15 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -4,6 +4,7 @@
#define ASPELL_DATADIR "@ASPELL_DATADIR@"
/* Avahi API 0.6 */
+#cmakedefine HAVE_DNSSD 1
#cmakedefine AVAHI_API_0_6 1
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt
index 0135967..844ee16 100644
--- a/dnssd/CMakeLists.txt
+++ b/dnssd/CMakeLists.txt
@@ -44,7 +44,7 @@ set( ${target}_SRCS
tde_add_library( ${target} SHARED AUTOMOC
SOURCES ${${target}_SRCS}
VERSION 1.0.0
- LINK tdecore-shared
+ LINK tdecore-shared ${AVAHI_TQT_LIBRARIES} ${AVAHI_CLIENT_LIBRARIES}
DEPENDENCIES tdeconfig_compiler
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/dnssd/publicservice.cpp b/dnssd/publicservice.cpp
index 0313fd1..05b8912 100644
--- a/dnssd/publicservice.cpp
+++ b/dnssd/publicservice.cpp
@@ -56,7 +56,7 @@ class PublicServicePrivate
public:
PublicServicePrivate() : m_published(false), m_running(false), m_collision(false)
#ifdef HAVE_DNSSD
- , m_group(false)
+ , m_group(0)
#endif
{}
bool m_published;