configure: Abort if Xlib isn't present when building for XCB.

The XCB port is still incomplete and needs Xlib in several places.
The configure script should reflect that and make sure Xlib is present.

Change-Id: I6d81ea6cacef56084cf7ccfbcf908d597aae918f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

1 files changed, 11 insertions, 5 deletions

diff --git a/configure b/configure
index a8f7402832..39e3c9f666 100755
--- a/configure
+++ b/configure
@@ -5191,11 +5191,6 @@ if [ "$CFG_TSLIB" != "no" ]; then
     fi
 fi
 
-# Check we actually have X11 :-)
-if compileTest x11/xlib "XLib"; then
-    QT_CONFIG="$QT_CONFIG xlib"
-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`"
@@ -5241,6 +5236,17 @@ if [ "$CFG_XCB" != "no" ]; then
             fi
         fi
 
+        # Check for X11. Eventually we should port everything to XCB,
+        # but for now the port is incomplete and Xlib is a requirement.
+        if compileTest x11/xlib "XLib"; then
+            QT_CONFIG="$QT_CONFIG xlib"
+        else
+            echo "The test for linking against Xlib failed!"
+            echo " You might need to install dependency packages."
+            echo " See src/plugins/platforms/xcb/README."
+            exit 1
+        fi
+
         if compileTest qpa/xcb-xlib "xcb-xlib" $QMAKE_CFLAGS_XCB $QMAKE_LIBS_XCB; then
             QT_CONFIG="$QT_CONFIG xcb-xlib"
         fi