On 07/07/2011 10:23 PM, Jarl Friis wrote:
> You need my other merge request
> (https://gitorious.org/merkaartor/main/merge_requests/36) which fixes
> include path to make it build on debian based system (my merge request
> will also solve this issue: http://merkaartor.be/issues/3294)
Your patch is not commplete - a patch using pkg-config is attached.
--
Bernd Zeimetz Debian GNU/Linux Developer
http://bzed.de http://www.debian.org
GPG Fingerprints: ECA1 E3F2 8E11 2432 D485 DD95 EB36 171A 6FF9 435F
From: Bernd Zeimetz <be...@bzed.de>
Date: Tue, 5 Jul 2011 23:03:14 +0200
Subject: Fix building under linux using pkg-config for libproxy.
Please note that this might not work on windows - adding
proper cflags should be necessary now. Nothign I can test here :)
---
src/Preferences/MerkaartorPreferences.h | 2 +-
src/Preferences/Preferences.pri | 12 ++++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/Preferences/MerkaartorPreferences.h b/src/Preferences/MerkaartorPreferences.h
index cb4b763..9ea81c0 100644
--- a/src/Preferences/MerkaartorPreferences.h
+++ b/src/Preferences/MerkaartorPreferences.h
@@ -21,7 +21,7 @@
#include <QNetworkProxy>
#ifdef USE_LIBPROXY
-#include <libproxy/proxy.h>
+#include <proxy.h>
#endif
#include "Maps/Coord.h"
diff --git a/src/Preferences/Preferences.pri b/src/Preferences/Preferences.pri
index 643c639..8dc2a3b 100644
--- a/src/Preferences/Preferences.pri
+++ b/src/Preferences/Preferences.pri
@@ -1,9 +1,17 @@
INCLUDEPATH += Preferences
DEPENDPATH += Preferences
-contains(LIBPROXY, 1) {
+
+contains(LIBPROXY, 1) {
DEFINES += USE_LIBPROXY
- LIBS += -lproxy
+ unix {
+ CONFIG += link_pkgconfig
+ PKGCONFIG += libproxy-1.0
+ }
+ win32 {
+ LIBS += -lproxy
+ }
}
+
HEADERS += MerkaartorPreferences.h \
PreferencesDialog.h \
WMSPreferencesDialog.h \
--
_______________________________________________
Merkaartor mailing list
Merkaartor@openstreetmap.org
http://lists.openstreetmap.org/listinfo/merkaartor
