From d8368941307b6fe9fc54465d60c4e55774b2da96 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 9 Oct 2011 20:46:09 +0000 Subject: [PATCH] Make ktorrent look for avahi-tqt instead of avahi-qt3 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/ktorrent@1258081 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- configure.in | 6 +++--- configure.in.in | 6 +++--- plugins/zeroconf/Makefile.am | 2 +- plugins/zeroconf/avahiservice.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.in b/configure.in index af2f8b4..b6d579d 100644 --- a/configure.in +++ b/configure.in @@ -255,10 +255,10 @@ PKG_CHECK_MODULES( AVAHI, avahi-client >= 0.6.10, avahi=false ]) -PKG_CHECK_MODULES( AVAHI_QT3, avahi-qt3 >= 0.6.10, +PKG_CHECK_MODULES( AVAHI_TQT, avahi-tqt >= 0.6.10, [ - AC_SUBST(AVAHI_QT3_CFLAGS) - AC_SUBST(AVAHI_QT3_LIBS) + AC_SUBST(AVAHI_TQT_CFLAGS) + AC_SUBST(AVAHI_TQT_LIBS) avahi=true ], [ diff --git a/configure.in.in b/configure.in.in index 81026cc..56cc979 100644 --- a/configure.in.in +++ b/configure.in.in @@ -190,10 +190,10 @@ PKG_CHECK_MODULES( AVAHI, avahi-client >= 0.6.10, avahi=false ]) -PKG_CHECK_MODULES( AVAHI_QT3, avahi-qt3 >= 0.6.10, +PKG_CHECK_MODULES( AVAHI_TQT, avahi-tqt >= 0.6.10, [ - AC_SUBST(AVAHI_QT3_CFLAGS) - AC_SUBST(AVAHI_QT3_LIBS) + AC_SUBST(AVAHI_TQT_CFLAGS) + AC_SUBST(AVAHI_TQT_LIBS) avahi=true ], [ diff --git a/plugins/zeroconf/Makefile.am b/plugins/zeroconf/Makefile.am index c6870e6..f8151e0 100644 --- a/plugins/zeroconf/Makefile.am +++ b/plugins/zeroconf/Makefile.am @@ -7,7 +7,7 @@ if COMPILE_ZEROCONF kde_module_LTLIBRARIES = ktzeroconfplugin.la endif -ktzeroconfplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(AVAHI_LIBS) $(AVAHI_QT3_LIBS) +ktzeroconfplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(AVAHI_LIBS) $(AVAHI_TQT_LIBS) ktzeroconfplugin_la_SOURCES = localbrowser.cpp avahiservice.cpp \ zeroconfplugin.cpp diff --git a/plugins/zeroconf/avahiservice.cpp b/plugins/zeroconf/avahiservice.cpp index 3b88989..a77d9ff 100644 --- a/plugins/zeroconf/avahiservice.cpp +++ b/plugins/zeroconf/avahiservice.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "localbrowser.h" #include "avahiservice.h"