From df4d7f18111420d05276312627c64c82c334e2a6 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Wed, 11 May 2011 12:32:46 +0200 Subject: Fix GLES2 include path for applications when not using the dash shell MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backslash escapes normally requires "-e" option to echo Reviewed-by: Jørgen (cherry picked from commit 68f37a29f911fce5bcdd285b1fc1bc6d4868d78e) --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index baa94cc1ba..6465146ebd 100755 --- a/configure +++ b/configure @@ -8438,7 +8438,7 @@ if [ -n "$QT_CFLAGS_FPU" ]; then fi if [ -n "$QMAKE_INCDIR_OPENGL_ES2" ]; then - echo "\n#Qt opengl include path" >> "$QTCONFIG.tmp" + echo "#Qt opengl include path" >> "$QTCONFIG.tmp" echo "QMAKE_INCDIR_OPENGL_ES2 = \"$QMAKE_INCDIR_OPENGL_ES2\"" >> "$QTCONFIG.tmp" fi -- cgit v1.2.3 From 01cbab598a7c4f199fa5782efdf6dc5666d04ed3 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Mon, 9 May 2011 11:34:17 +0200 Subject: 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 (cherry picked from commit 912b6804bcacbf1b4f356d947986df8156a545a4) --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 6465146ebd..fdf46e4117 100755 --- a/configure +++ b/configure @@ -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= -- cgit v1.2.3