summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Rosenkraenzer <bero@arklinux.ch>2011-05-09 09:34:17 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-05-09 09:34:17 (GMT)
commit912b6804bcacbf1b4f356d947986df8156a545a4 (patch)
treebc930f49ae7b9717f0a7fc81c08da3d8044692aa
parente2654a15e78165c91c068f68265cc11b2f07c588 (diff)
downloadQt-912b6804bcacbf1b4f356d947986df8156a545a4.zip
Qt-912b6804bcacbf1b4f356d947986df8156a545a4.tar.gz
Qt-912b6804bcacbf1b4f356d947986df8156a545a4.tar.bz2
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>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 8355997..95debec 100755
--- a/configure
+++ b/configure
@@ -5515,7 +5515,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
fi # X11/QWS
# X11
-if [ "$PLATFORM_X11" = "yes" ]; then
+if [ "$PLATFORM_X11" = "yes" -a "$CFG_GUI" != "no" ]; then
x11tests="$relpath/config.tests/x11"
X11TESTS_FLAGS=