diff options
author | Nicolás Alvarez <nicolas.alvarez@gmail.com> | 2013-07-29 19:19:58 -0300 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-21 23:50:18 +0200 |
commit | 683451e7c74d23abb0268a187d28cf7dc7afd032 (patch) | |
tree | 1161c713b778171fbcb8b0fa41d8790fb7ad114f /configure | |
parent | 37dc44d499884bd0d7ab9d2f1547db468c9fe53b (diff) |
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>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 16 |
1 files changed, 11 insertions, 5 deletions
@@ -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 |