[patch] patch 2

transmission-2.41-0002-config.in-4-qt.pro.patch (text/plain), 1.74 KB, created by Daniel on 2011-10-16 21:37:21 UTC

From 9b55e6ce1a98b4c2f32349982d4172d0971601c6 Mon Sep 17 00:00:00 2001
From: Peter Volkov <[e-mail]>
Date: Thu, 16 Jun 2011 12:48:11 +0400
Subject: [PATCH 2/3] Add qt/config to make qmake aware about ./configure results. This simplifies use of system third-party tools. Fixes build issue caused by ordering of make/qmake run: bugs.gentoo.org/368523.

---
 configure.ac |    5 ++++-
 qt/config.in |    1 +
 qt/qtr.pro   |    6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 qt/config.in

diff --git a/configure.ac b/configure.ac
index 421946f..bf0622b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -414,7 +414,8 @@
                  web/javascript/Makefile
                  web/javascript/jquery/Makefile
                  web/stylesheets/Makefile
-                 po/Makefile.in])
+                 po/Makefile.in
+		 qt/config])
 
 AC_OUTPUT
 
diff --git a/qt/config.in b/qt/config.in
new file mode 100644
index 0000000..3340d1a
--- /dev/null
+++ b/qt/config.in
@@ -0,0 +1 @@
+LIBUTP_LIBS = @LIBUTP_LIBS_QT@
diff --git a/qt/qtr.pro b/qt/qtr.pro
index ce138a2..4e28e98 100644
--- a/qt/qtr.pro
+++ b/qt/qtr.pro
@@ -16,12 +16,12 @@ QT += network
 PKGCONFIG = fontconfig libcurl openssl libevent
 
 TRANSMISSION_TOP = ..
+include(config)
+
 INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH}
 INCLUDEPATH += $${TRANSMISSION_TOP}
 LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
-exists( $${TRANSMISSION_TOP}/third-party/libutp/libutp.a ) { 
-    LIBS += $${TRANSMISSION_TOP}/third-party/libutp/libutp.a
-}
+LIBS += $${LIBUTP_LIBS}
 LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
 LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
 LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
-- 
1.7.3.4