From 7789c28f44f6f20468d82327f7ff2262cb3e5012 Mon Sep 17 00:00:00 2001 From: Mike Gelfand Date: Sun, 28 Dec 2014 00:02:50 +0000 Subject: [PATCH] #5808: Don't embed path to DHT_LIBS in qtr.pro (patch by jbeich) --- configure.ac | 2 ++ qt/config.pri.in | 1 + qt/qtr.pro | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index dfa6b8271..fee10fbc0 100644 --- 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 84937777e..900d6b827 100644 --- 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 80b422a7a..32da39ac6 100644 --- 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