From 38813a3b328390fc3f1ff0f9201300edd6ff6f29 Mon Sep 17 00:00:00 2001
From: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Date: Sat, 18 Jan 2014 01:23:01 +0100
Subject: Use pkg-config to find the prefix for X11 install

Needed to run the XKB extension where we used to expect X11 to be
installed in /usr. In FreeBSD, for instance, X11 is installed in
/usr/local like all the other not out-of-the-box packages.

Same thing goes for the compose platform input context plugin.

Change-Id: Ib7ace3117eaacc6e150394450d1330cba654ba8a
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
---
 configure | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'configure')

diff --git a/configure b/configure
index 8fda890da5..cb4ea3f0eb 100755
--- a/configure
+++ b/configure
@@ -5130,6 +5130,14 @@ if [ "$CFG_XCB" != "no" ]; then
         else
             CFG_XCB="system"
 
+            if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then
+                QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
+            else
+                # default to LSB prefix
+                QMAKE_X11_PREFIX="/usr"
+            fi
+            QMakeVar set QMAKE_X11_PREFIX "$QMAKE_X11_PREFIX"
+
             if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
                 XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm"
                 QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`"
-- 
cgit v1.2.3