From 7067c3268a6838fcfa7d2e7584f4296e71d947ec Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 21 Mar 2013 13:08:09 -0700
Subject: Suppress warning about xkbcommon unless we're building XCB
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I don't need that warning on my Mac.

Change-Id: I18c06135ba88a037103fdda0982976f4a87c553e
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 configure | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index c66f1b66e3..a276647137 100755
--- a/configure
+++ b/configure
@@ -5217,8 +5217,8 @@ if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xkbcommon >= 0.2.0" 2>/dev/null
     QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`"
     QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`"
     QT_CONFIG="$QT_CONFIG xkbcommon"
-else
-    echo "WARNING: Qt requires the libxkbcommon version 0.2.0 (or higher)."
+elif [ "$CFG_XCB" != "no" ]; then
+    echo "WARNING: XCB support enabled but libxkbcommon 0.2.0 (or higher) not found."
     echo "Not satisfying this requirement will disable the compose key functionality,"
     echo "which includes text input with dead keys."
     QMakeVar add DEFINES QT_NO_XKBCOMMON
-- 
cgit v1.2.3