diff options
author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-01 09:07:16 (GMT) |
---|---|---|
committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-04-03 11:40:34 (GMT) |
commit | b652130dc00dfab7322751275e42f59943c7e8e3 (patch) | |
tree | 656ac90ae4e61ff2d189f525ea7185c5bdd07e4d /configure | |
parent | dcff85182dda913b45867e27fde3f37e61ae86d6 (diff) | |
download | Qt-b652130dc00dfab7322751275e42f59943c7e8e3.zip Qt-b652130dc00dfab7322751275e42f59943c7e8e3.tar.gz Qt-b652130dc00dfab7322751275e42f59943c7e8e3.tar.bz2 |
Add config test for XLib
Previously, it was entirely possible to successfully configure Qt/X11
without any X11 installed. The problems would only start showing up once
you stated building. This is not very useful if you're cross-compiling
and trying to setup the paths correctly.
Reviewed-by: Denis
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -4727,6 +4727,14 @@ if [ "$PLATFORM_X11" = "yes" ]; then X11TESTS_FLAGS="$X11TESTS_FLAGS -fpermissive" fi + # Check we actually have X11 :-) + if ! "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + echo "Basic XLib functionality test failed!" + echo " You might need to modify the include and library search paths by editing" + echo " QMAKE_INCDIR_X11 and QMAKE_LIBDIR_X11 in ${XQMAKESPEC}." + exit 1 + fi + # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/opengl "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then |