Browse Source

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>
pull/63/head
Slávek Banko 1 month ago
parent
commit
281e2da7f1
Signed by: SlavekB <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
4 changed files with 12 additions and 12 deletions
  1. +9
    -10
      CMakeLists.txt
  2. +1
    -0
      config.h.cmake
  3. +1
    -1
      dnssd/CMakeLists.txt
  4. +1
    -1
      dnssd/publicservice.cpp

+ 9
- 10
CMakeLists.txt View File

@@ -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( )




+ 1
- 0
config.h.cmake View File

@@ -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


+ 1
- 1
dnssd/CMakeLists.txt View File

@@ -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}
)

+ 1
- 1
dnssd/publicservice.cpp View File

@@ -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;


Loading…
Cancel
Save