(trunk qt) #4490 "transmission-qt FTB, undefined references to UTP library" -- fixed...

diff --git a/configure.ac b/configure.ac
index 1d7d96370822aab1dcbd9ac249111671417843d1..447a4b70a29c16042aed79d36fe9995b9b56dfa5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -222,8 +222,10 @@ if test "x$want_utp" = "xyes" ; then
     if test "x$have_utp" = "xyes"; then
         LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
         LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
+        LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a"
         if test "x$libutp_extra_libs" != "x" ; then
             LIBUTP_LIBS="$LIBUTP_LIBS $libutp_extra_libs"
+            LIBUTP_LIBS_QT="$LIBUTP_LIBS_QT $libutp_extra_libs"
         fi
         AC_DEFINE([WITH_UTP],[1])
         build_utp="yes"
@@ -233,6 +235,7 @@ if test "x$want_utp" = "xyes" ; then
 fi
 AC_SUBST(LIBUTP_CFLAGS)
 AC_SUBST(LIBUTP_LIBS)
+AC_SUBST(LIBUTP_LIBS_QT)
 AM_CONDITIONAL([BUILD_UTP],[test "x$build_utp" = "xyes"])
 AC_MSG_RESULT([$build_utp])
 
@@ -530,6 +533,7 @@ AC_CONFIG_FILES([Makefile
                  macosx/Makefile
                  gtk/Makefile
                  gtk/icons/Makefile
+                 qt/config.pri
                  web/Makefile
                  web/images/Makefile
                  web/style/Makefile

diff --git a/qt/qtr.pro b/qt/qtr.pro
index 44f43550b6ec382c746412286674cdea545dddcf..4e320435bf9131bfa26b5db26e9068307162ca29 100644 (file)
--- a/qt/qtr.pro
+++ b/qt/qtr.pro
@@ -16,17 +16,16 @@ QT += network
 PKGCONFIG = fontconfig libcurl openssl libevent
 
 TRANSMISSION_TOP = ..
+
+include(config.pri) 
+
 INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
 INCLUDEPATH += $${TRANSMISSION_TOP}
 LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
-exists( $${TRANSMISSION_TOP}/third-party/libutp/Makefile ) { 
-    LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a
-}
+LIBS += $${LIBUTP_LIBS}
 LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
-exists( $${TRANSMISSION_TOP}/third-party/miniupnp/Makefile ) { 
-    LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
-}
-LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
+LIBS += $${LIBUPNP_LIBS}
+LIBS += $${LIBNATPMP_LIBS}
 unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
 win32:DEFINES += QT_DBUS
 win32:LIBS += -levent-2.0 -lws2_32 -lintl