From 86260a117c9ce64d3dee71ab241559c0529f2ef5 Mon Sep 17 00:00:00 2001
From: Bernhard Rosenkraenzer <br@blankpage.ch>
Date: Thu, 6 May 2010 14:11:32 +0200
Subject: Fix syntax error in configure script

./configure: line 5883: [: missing `]'
./configure: line 5883: no: command not found

It's either
	if [ "$CFG_OPENGL" = "es1" -o "$CFG_OPENGL" = "es2" ]; then
or
	if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es2" ]; then
but not
	if [ "$CFG_OPENGL" = "es1" ||  "$CFG_OPENGL" = "es2" ]; then

Merge-request: 616
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 47eec92..3ed017d 100755
--- a/configure
+++ b/configure
@@ -5880,7 +5880,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
             fi
             CFG_EGL=no
             # If QtOpenGL would be built against OpenGL ES, disable it as we can't to that if EGL is missing
-            if [ "$CFG_OPENGL" = "es1" ||  "$CFG_OPENGL" = "es2" ]; then
+            if [ "$CFG_OPENGL" = "es1" -o "$CFG_OPENGL" = "es2" ]; then
                 CFG_OPENGL=no
             fi
         fi
-- 
cgit v0.12