From: Jordan Lee <jordan@transmissionbt.com>
Date: Fri, 18 Feb 2011 00:32:19 +0000 (+0000)
Subject: automake/autoconf; #includes in libtransmission
X-Git-Tag: 2.30b1~334
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7df7d34f6d5203ae10f754e0c1831ba3c1382e58;p=transmission

automake/autoconf; #includes in libtransmission
---

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 2c15d42ac..9d618f2d3 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -21,6 +21,7 @@ transmission_cli_LDADD = \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
     @OPENSSL_LIBS@ \
diff --git a/configure.ac b/configure.ac
index aea0d1427..05bed0a0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,6 +215,16 @@ AC_SUBST(DHT_CFLAGS)
 AC_SUBST(DHT_LIBS)
 
 
+dnl ----------------------------------------------------------------------------
+dnl
+dnl  utp
+
+LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
+LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
+AC_SUBST(LIBUTP_CFLAGS)
+AC_SUBST(LIBUTP_LIBS)
+
+
 dnl ----------------------------------------------------------------------------
 dnl
 dnl  detection for the GTK+ client
@@ -470,6 +480,7 @@ AC_CONFIG_FILES([Makefile
                  third-party/Makefile
                  third-party/miniupnp/Makefile
                  third-party/libnatpmp/Makefile
+                 third-party/libutp/Makefile
                  third-party/dht/Makefile
                  macosx/Makefile
                  gtk/Makefile
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 01cf1218a..9e2a10aed 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -23,6 +23,7 @@ LDADD = \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
     @OPENSSL_LIBS@ \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 462c3830a..68d2713d5 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -100,6 +100,7 @@ transmission_gtk_LDADD = \
     @LIBCANBERRA_LIBS@ \
     @GCONF2_LIBS@ \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @GTK_LIBS@ \
     @GIO_LIBS@ \
     @LIBAPPINDICATOR_LIBS@ \
diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index 418417d0c..96018a9fa 100644
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = \
     @DHT_CFLAGS@ \
+    @LIBUTP_CFLAGS@ \
     @LIBEVENT_CFLAGS@ \
     @LIBCURL_CFLAGS@ \
     @OPENSSL_CFLAGS@ \
@@ -142,6 +143,7 @@ apps_ldadd = \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     @INTLLIBS@ \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @LIBCURL_LIBS@ \
     @LIBEVENT_LIBS@ \
     @OPENSSL_LIBS@ \
diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index d6cf91911..03c31a56b 100644
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -25,7 +25,7 @@
 
 #include <event2/event.h>
 #include <event2/bufferevent.h>
-#include "utp.h"
+#include <libutp/utp.h>
 
 #include "transmission.h"
 #include "session.h"
diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index 5051e07a7..f9284a271 100644
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -17,7 +17,7 @@
 #include <stdlib.h> /* qsort */
 
 #include <event2/event.h>
-#include "utp.h"
+#include <libutp/utp.h>
 
 #include "transmission.h"
 #include "announcer.h"
diff --git a/libtransmission/tr-utp.c b/libtransmission/tr-utp.c
index 9a74c710d..b56b85cf4 100644
--- a/libtransmission/tr-utp.c
+++ b/libtransmission/tr-utp.c
@@ -24,7 +24,7 @@ THE SOFTWARE.
 #include <unistd.h>
 
 #include <event.h>
-#include "utp.h"
+#include <libutp/utp.h>
 
 #include "transmission.h"
 #include "net.h"
diff --git a/qt/qtr.pro b/qt/qtr.pro
index 4830f51f9..93a699eb6 100644
--- a/qt/qtr.pro
+++ b/qt/qtr.pro
@@ -18,6 +18,7 @@ PKGCONFIG = fontconfig libcurl openssl libevent
 TRANSMISSION_TOP = ..
 INCLUDEPATH += $${TRANSMISSION_TOP}
 LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
+LIBS += $${TRANSMISSION_TOP}/third-party/dht/libutp.a
 LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
 LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
 LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
diff --git a/third-party/Makefile.am b/third-party/Makefile.am
index 7c25de1d4..69543f3a1 100644
--- a/third-party/Makefile.am
+++ b/third-party/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = libnatpmp miniupnp dht
+SUBDIRS = libnatpmp miniupnp libutp dht
 
 EXTRA_DIST = \
   macosx-libevent-config.h \
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 818e29f17..896cb2b67 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -30,6 +30,7 @@ transmission_create_LDADD = \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     @INTLLIBS@ \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
     @OPENSSL_LIBS@ \