diff options
| author | Bernhard Rosenkraenzer <bero@arklinux.ch> | 2011-05-09 11:34:17 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-11 16:39:54 +0200 |
| commit | 01cbab598a7c4f199fa5782efdf6dc5666d04ed3 (patch) | |
| tree | 28c66da114945005bb42992e7093cc800fc55b8a /configure | |
| parent | c1077e9fb66833894ff1f36b70ca47f299f53da6 (diff) | |
| download | qtbase-01cbab598a7c4f199fa5782efdf6dc5666d04ed3.tar.gz | |
Don't run XLib check if -no-gui is used
Currently, an attempt to compile Qt even with -no-gui on a Linux box
that doesn't have libX11 installed fails becaue of the XLib
functionality check in configure.
This check can be turned off in -no-gui mode, since QtCore, QtXml,
QtNetwork and friends don't use libX11.
Merge-request: 1214
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 912b6804bcacbf1b4f356d947986df8156a545a4)
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5774,7 +5774,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye fi # X11/QWS/Lighthouse # X11 -if [ "$PLATFORM_X11" = "yes" ]; then +if [ "$PLATFORM_X11" = "yes" -a "$CFG_GUI" != "no" ]; then x11tests="$relpath/config.tests/x11" X11TESTS_FLAGS= |