From 4ec935b3e738f79d76b708773c49471cffc46f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Wed, 2 Mar 2011 16:15:47 +0100
Subject: Lighthouse: Make wayland configure check use pkg-config

Reviewed-by: paul
---
 config.tests/qpa/wayland/wayland.pro |  6 ++----
 configure                            | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/config.tests/qpa/wayland/wayland.pro b/config.tests/qpa/wayland/wayland.pro
index 266e4d6..0c2b899 100644
--- a/config.tests/qpa/wayland/wayland.pro
+++ b/config.tests/qpa/wayland/wayland.pro
@@ -1,6 +1,4 @@
 SOURCES = wayland.cpp
 CONFIG -= qt
-
-QMAKE_CXXFLAGS += $$QT_CFLAGS_WAYLAND
-LIBS += $$QT_LIBS_WAYLAND -lfreetype -lfontconfig -lwayland-client
-
+INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND
+LIBS += $$QMAKE_LIBS_WAYLAND
diff --git a/configure b/configure
index b95baab..664af92 100755
--- a/configure
+++ b/configure
@@ -6171,10 +6171,23 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
                 CFG_LIBFREETYPE=system
         fi
 
-        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS; then
-                QT_CONFIG="$QT_CONFIG wayland"
-        fi
+    fi
+
+    if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists wayland-client 2>/dev/null; then
+        QMAKE_CFLAGS_WAYLAND=`$PKG_CONFIG --cflags wayland-client 2>/dev/null`
+        QMAKE_LIBS_WAYLAND=`$PKG_CONFIG --libs wayland-client 2>/dev/null`
+        QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --variable=includedir wayland-client 2>/dev/null`
+    fi
+
+    # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero.
+    if [ -n "$QMAKE_CFLAGS_WAYLAND" ] || [ -n "$QMAKE_LIBS_WAYLAND" ]; then
+        QMakeVar set QMAKE_CFLAGS_WAYLAND "$QMAKE_CFLAGS_WAYLAND"
+        QMakeVar set QMAKE_INCDIR_WAYLAND "$QMAKE_INCDIR_WAYLAND"
+        QMakeVar set QMAKE_LIBS_WAYLAND "$QMAKE_LIBS_WAYLAND"
+    fi
 
+    if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND -I$QMAKE_INCDIR_WAYLAND $QMAKE_LIBS_WAYLAND; then
+        QT_CONFIG="$QT_CONFIG wayland"
     fi
 
     if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/coreservices "CoreServices" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
-- 
cgit v0.12