From abb03aa734a63535bec7b045054bf6e5ab0fc1d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Tue, 22 Mar 2011 12:13:29 +0100
Subject: [PATCH] Fix how wayland is compiled so that we can pick up libffi
 from

pkg-config
---
 src/3rdparty/wayland/client/client.pro | 6 ++----
 src/3rdparty/wayland/server/server.pro | 6 ++----
 src/3rdparty/wayland/shared.pri        | 9 +++++++++
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 src/3rdparty/wayland/shared.pri

diff --git a/src/3rdparty/wayland/client/client.pro b/src/3rdparty/wayland/client/client.pro
index ebf24b4ee76..71af897a592 100644
--- a/src/3rdparty/wayland/client/client.pro
+++ b/src/3rdparty/wayland/client/client.pro
@@ -4,11 +4,9 @@ DESTDIR=$$PWD/../../../../lib/
 
 CONFIG -= qt
 CONFIG += shared
+CONFIG += use_pkgconfig
 
-INCLUDEPATH += $$PWD/.. \
-               $$PWD/../../ffi
-
-LIBS += -L $$PWD/../../../../lib/ -lffi
+include(../shared.pri)
 
 SOURCES = ../wayland-client.c \
           ../wayland-protocol.c \
diff --git a/src/3rdparty/wayland/server/server.pro b/src/3rdparty/wayland/server/server.pro
index 2c1788ce242..da2bf36431d 100644
--- a/src/3rdparty/wayland/server/server.pro
+++ b/src/3rdparty/wayland/server/server.pro
@@ -4,11 +4,9 @@ DESTDIR=$$PWD/../../../../lib/
 
 CONFIG -= qt
 CONFIG += shared
+CONFIG += use_pkgconfig
 
-INCLUDEPATH += $$PWD/.. \
-               $$PWD/../../ffi
-
-LIBS += -L $$PWD/../../../../lib/ -lffi
+include(../shared.pri)
 
 SOURCES = ../event-loop.c \
           ../wayland-server.c \
diff --git a/src/3rdparty/wayland/shared.pri b/src/3rdparty/wayland/shared.pri
new file mode 100644
index 00000000000..44194dca7ad
--- /dev/null
+++ b/src/3rdparty/wayland/shared.pri
@@ -0,0 +1,9 @@
+INCLUDEPATH += $$PWD
+
+use_pkgconfig {
+   CONFIG += link_pkgconfig
+   PKGCONFIG += libffi
+} else {
+    LIBS += -L $$PWD/../../../../lib/ -lffi 
+    INCLUDEPATH += $$PWD/../ffi
+}