diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-04-03 12:28:07 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-04-03 12:28:07 (GMT) |
| commit | 0ac4fd86b62f418b4e366afa86c75d7775e9da90 (patch) | |
| tree | a9ca9c8b924de174c9958e69df361440bb6b74aa /configure | |
| parent | 0bb93751c80109a13f6391c8bbfb74693b484699 (diff) | |
| parent | f9e0b4e7d57b568ab20b7c77e284f966ff6baf41 (diff) | |
| download | Qt-0ac4fd86b62f418b4e366afa86c75d7775e9da90.zip Qt-0ac4fd86b62f418b4e366afa86c75d7775e9da90.tar.gz Qt-0ac4fd86b62f418b4e366afa86c75d7775e9da90.tar.bz2 | |
Merge branch '4.5'
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 |