From e033beead21105928b4039eb5551d0633078cdf5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 4 Sep 2010 18:38:22 +0000 Subject: Fix FTBFS due to migration from pim to libs git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1171633 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- networkstatus/Makefile.am | 2 ++ networkstatus/networkstatus.cpp | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) (limited to 'networkstatus') diff --git a/networkstatus/Makefile.am b/networkstatus/Makefile.am index c59aa55c6..525ad6a7e 100644 --- a/networkstatus/Makefile.am +++ b/networkstatus/Makefile.am @@ -2,6 +2,8 @@ METASOURCES = AUTO +INCLUDES = -I$(top_srcdir)/kded -I$(top_srcdir) $(all_includes) + kde_module_LTLIBRARIES = kded_networkstatus.la lib_LTLIBRARIES = libnetworkstatus.la libconnectionmanager.la diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp index 092f2b392..21e34d978 100644 --- a/networkstatus/networkstatus.cpp +++ b/networkstatus/networkstatus.cpp @@ -32,7 +32,19 @@ #include "clientifaceimpl.h" #include "serviceifaceimpl.h" #include "network.h" -#include + +#include +#include + +#if KDE_IS_VERSION( 3,3,90 ) +/* life is great */ +#else +/* workaround typo that breaks compilation with newer gcc */ +#undef KDE_EXPORT +#define KDE_EXPORT +#undef KDE_NO_EXPORT +#define KDE_NO_EXPORT +#endif extern "C" { KDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj ) -- cgit v1.2.1