Changeset 13200

Timestamp:

Feb 4, 2012, 1:55:58 AM (11 years ago)

Author:

jordan

Message:

(trunk qt) #4490 "transmission-qt FTB, undefined references to UTP library" -- fixed with patch by niol

Location:

trunk

Files:

• configure.ac (modified) (3 diffs)
• qt/qtr.pro (modified) (1 diff)

trunk/configure.ac

@@ -223 +223 @@
         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])
@@ -234 +236 @@
 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])
@@ -531 +534 @@
                  gtk/Makefile
                  gtk/icons/Makefile
+                 qt/config.pri
                  web/Makefile
                  web/images/Makefile

trunk/qt/qtr.pro

@@ -17 +17 @@
 
 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