Force enable OpenGL ES2 on NaCl

1 files changed, 13 insertions, 10 deletions

diff --git a/configure b/configure
index 328a4ab61e..1d688d9ecb 100755
--- a/configure
+++ b/configure
@@ -966,6 +966,7 @@ CFG_XMLPATTERNS=no
 CFG_SCRIPT=no
 CFG_SQLITE=no
 CFG_SQL_sqlite=no
+CFG_OPENGL=es2
 CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS tests"
 
 
@@ -5056,13 +5057,15 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_EMBLITE" =
         CFG_EGL=yes
         CFG_EGL_GLES_INCLUDES=yes
     fi
-    if ( [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es1cl" ] || [ "$CFG_OPENGL" = "es2" ] ) && [ "$CFG_EGL" != "yes" ]; then
-        echo "The EGL functionality test failed!"
-        echo " EGL is required for OpenGL ES to manage contexts & surfaces."
-        echo " You might need to modify the include and library search paths by editing"
-        echo " QMAKE_INCDIR_EGL, QMAKE_LIBDIR_EGL and QMAKE_LIBS_EGL in"
-        echo " ${XQMAKESPEC}."
-        exit 1
+    if [ "$CFG_NACL" != "yes" ]; then
+        if ( [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es1cl" ] || [ "$CFG_OPENGL" = "es2" ] ) && [ "$CFG_EGL" != "yes" ]; then
+            echo "The EGL functionality test failed!"
+            echo " EGL is required for OpenGL ES to manage contexts & surfaces."
+            echo " You might need to modify the include and library search paths by editing"
+            echo " QMAKE_INCDIR_EGL, QMAKE_LIBDIR_EGL and QMAKE_LIBS_EGL in"
+            echo " ${XQMAKESPEC}."
+            exit 1
+        fi    
     fi
 
 
@@ -5209,8 +5212,8 @@ if [ "$PLATFORM_X11" = "yes" ]; then
             echo " ${XQMAKESPEC}."
             exit 1
         fi
-    elif [ "$CFG_OPENGL" = "es2" ]; then
-        #OpenGL ES 2.x
+    elif [ "$CFG_OPENGL" = "es2" ] && [ "$CFG_NACL" != "yes"]; then
+     #OpenGL ES 2.x
 	"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS
         if [ $? != "0" ]; then
 	    echo "The OpenGL ES 2.0 functionality test failed!"
@@ -5533,7 +5536,7 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_EMBLITE" = "yes" ]; then
 	    echo " ${XQMAKESPEC}."
             exit 1
         fi
-    elif [ "$CFG_OPENGL" = "es2" ]; then
+    elif [ "$CFG_OPENGL" = "es2" ] && [ "$CFG_NACL" != "yes"]; then
         #OpenGL ES 2.x
 	"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS
         if [ $? != "0" ]; then