diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2013-07-27 16:38:46 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-07-27 18:48:23 +0200 |
| commit | 88ea2b6cd4382627fb6efca9cc54825aee881d1e (patch) | |
| tree | 6806d60f9a9c8f8dd6a66d8df98dabe0f5d62142 | |
| parent | fcd5266f7137e0ec167da80298af9a6a47ace17c (diff) | |
| download | tork-88ea2b6cd4382627fb6efca9cc54825aee881d1e.tar.gz tork-88ea2b6cd4382627fb6efca9cc54825aee881d1e.zip | |
Update autotools for new DSO linkage style
Fix FTBFS
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/arkollon/Makefile.am | 2 | ||||
| -rw-r--r-- | src/likeback.cpp | 1 | ||||
| -rw-r--r-- | src/upnp/upnprouter.h | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8f0198a..07decfb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,7 @@ METASOURCES = AUTO tork_LDFLAGS = $(KDE_RPATH) $(all_libraries) # the libraries to link against. -tork_LDADD = $(LIB_KIO) $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) \ +tork_LDADD = $(LIB_KIO) $(LIB_KFILE) $(LIB_KHTML) $(geoiplib) $(LIB_KDEUI) $(LIB_KDECORE) -lDCOP $(LIB_QT) \ upnp/libktupnp.la $(CRYPTO_LIBS) # which sources should be compiled for tork diff --git a/src/arkollon/Makefile.am b/src/arkollon/Makefile.am index 81cea55..ef01542 100644 --- a/src/arkollon/Makefile.am +++ b/src/arkollon/Makefile.am @@ -26,7 +26,7 @@ torkarkollon_LDFLAGS = $(all_libraries) LIBS = #torkarkollon_LDFLAGS = #torkarkollon_LDADD = $(LIB_QT) $(LIB_KFILE) -torkarkollon_LDADD = $(LIB_KFILE) $(LIB_QT) +torkarkollon_LDADD = $(LIB_KFILE) $(LIB_QT) $(LIB_KDECORE) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/src/likeback.cpp b/src/likeback.cpp index d38f6b5..e8cadf4 100644 --- a/src/likeback.cpp +++ b/src/likeback.cpp @@ -50,6 +50,7 @@ #include <pwd.h> #include <iostream> +#include <unistd.h> #include "likeback.h" #include "likeback_private.h" diff --git a/src/upnp/upnprouter.h b/src/upnp/upnprouter.h index d717a49..f685620 100644 --- a/src/upnp/upnprouter.h +++ b/src/upnp/upnprouter.h @@ -242,7 +242,7 @@ namespace kt * @param port The local port to forward */ void forward(const net::Port & externalport, - const net::Port & internalport = net::Port::Port(), + const net::Port & internalport = net::Port(), bool force = false); /** @@ -291,7 +291,7 @@ namespace kt bt::HTTPRequest* sendSoapQuery(const QString & query,const QString & soapact,const QString & controlurl,bool fwd, bool at_exit = false ); bool verbose; - void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port::Port()); + void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port()); void undoForward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport,bt::WaitJob* waitjob); void httpRequestDone(bt::HTTPRequest* r,bool erase_fwd); |