From 2e9345b627dedb7cf224ab71479c76bd302ee294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Alvarez?= <nicolas.alvarez@gmail.com>
Date: Mon, 29 Jul 2013 19:19:06 -0300
Subject: configure: Check for Xrender only when building for XCB.

The XCB platform plugin is the only one that requires Xrender.

Change-Id: Iac2efa31b4b51e38305ee5f635fe38b75c7752de
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---
 configure | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index 43eed32807..a8f7402832 100755
--- a/configure
+++ b/configure
@@ -5196,24 +5196,6 @@ if compileTest x11/xlib "XLib"; then
     QT_CONFIG="$QT_CONFIG xlib"
 fi
 
-# auto-detect Xrender support
-if [ "$CFG_XRENDER" != "no" ]; then
-    if compileTest x11/xrender "Xrender"; then
-        CFG_XRENDER=yes
-        QT_CONFIG="$QT_CONFIG xrender"
-    else
-        if [ "$CFG_XRENDER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
-            echo "Xrender support cannot be enabled due to functionality tests!"
-            echo " Turn on verbose messaging (-v) to $0 to see the final report."
-            echo " If you believe this message is in error you may use the continue"
-            echo " switch (-continue) to $0 to continue."
-            exit 101
-        else
-            CFG_XRENDER=no
-        fi
-    fi
-fi
-
 if [ "$CFG_XCB" != "no" ]; then
     if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then
         QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags xcb 2>/dev/null`"
@@ -5263,6 +5245,24 @@ if [ "$CFG_XCB" != "no" ]; then
             QT_CONFIG="$QT_CONFIG xcb-xlib"
         fi
 
+        # auto-detect Xrender support
+        if [ "$CFG_XRENDER" != "no" ]; then
+            if compileTest x11/xrender "Xrender"; then
+                CFG_XRENDER=yes
+                QT_CONFIG="$QT_CONFIG xrender"
+            else
+                if [ "$CFG_XRENDER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+                    echo "Xrender support cannot be enabled due to functionality tests!"
+                    echo " Turn on verbose messaging (-v) to $0 to see the final report."
+                    echo " If you believe this message is in error you may use the continue"
+                    echo " switch (-continue) to $0 to continue."
+                    exit 101
+                else
+                    CFG_XRENDER=no
+                fi
+            fi
+        fi
+
         # auto-detect XInput2 support. Needed by xcb too.
         if [ "$CFG_XINPUT2" != "no" ]; then
             if compileTest x11/xinput2 "XInput2"; then
-- 
cgit v1.2.3