#5808: Don't embed path to DHT_LIBS in qtr.pro (patch by jbeich)

diff --git a/configure.ac b/configure.ac
index dfa6b8271792f60bb945db5d41b1c068f70efa07..fee10fbc0e3e99a09aa3acf17af714d959375eda 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -196,8 +196,10 @@ dnl  dht
 
 DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
 DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
+DHT_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/dht/libdht.a"
 AC_SUBST(DHT_CFLAGS)
 AC_SUBST(DHT_LIBS)
+AC_SUBST(DHT_LIBS_QT)
 
 
 dnl ----------------------------------------------------------------------------

diff --git a/qt/config.pri.in b/qt/config.pri.in
index 84937777eefbc4b235336384474f40a49cab77fc..900d6b827032ae062b4688d3da26e5aacb54c7ef 100644 (file)
--- a/qt/config.pri.in
+++ b/qt/config.pri.in
@@ -1,3 +1,4 @@
+DHT_LIBS = @DHT_LIBS_QT@
 LIBUTP_LIBS = @LIBUTP_LIBS_QT@ 
 LIBUPNP_LIBS = @LIBUPNP_LIBS_QT@
 LIBNATPMP_LIBS = @LIBNATPMP_LIBS_QT@

diff --git a/qt/qtr.pro b/qt/qtr.pro
index 80b422a7a063f6d4055813f3bbe1a72bc3005e8a..32da39ac6630cab7ec03e4222bb050730f7f8083 100644 (file)
--- a/qt/qtr.pro
+++ b/qt/qtr.pro
@@ -27,7 +27,7 @@ INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
 INCLUDEPATH += $${TRANSMISSION_TOP}
 LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
 LIBS += $${LIBUTP_LIBS}
-LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
+LIBS += $${DHT_LIBS}
 LIBS += $${LIBUPNP_LIBS}
 LIBS += $${LIBNATPMP_LIBS}
 unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt