diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-09 20:46:09 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-09 20:46:09 +0000 |
| commit | d8368941307b6fe9fc54465d60c4e55774b2da96 (patch) | |
| tree | d4e9acfc53ce964215fa90f5a8cda287f76d888b | |
| parent | 3dd0954b96eacf8f6e8a3ee225240be70924d652 (diff) | |
| download | ktorrent-d8368941307b6fe9fc54465d60c4e55774b2da96.tar.gz ktorrent-d8368941307b6fe9fc54465d60c4e55774b2da96.zip | |
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
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | configure.in.in | 6 | ||||
| -rw-r--r-- | plugins/zeroconf/Makefile.am | 2 | ||||
| -rw-r--r-- | 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 <util/log.h> #include <torrent/peerid.h> #include <avahi-common/watch.h> -#include <avahi-qt3/qt-watch.h> +#include <avahi-tqt/qt-watch.h> #include "localbrowser.h" #include "avahiservice.h" |