commit 58c33adc06567875e1f6f3f4a7cdc77099b55881
author David 'Digit' Turner <digit@google.com> Sun Jan 19 17:29:40 2014 +0100
committer David 'Digit' Turner <digit@google.com> Tue Feb 11 00:47:06 2014 +0100
tree 50032be8bdfd1594e0b2f703f93111a567d678b0
parent 3d621099b7deeecdb2b41a5f7658237a79e5808d

android-configure.sh: Fix GLES auto-detection.

If android-configure.sh didn't find GL emulation headers and
libraries, it would complain but fail to disable it for the
current build. This patch fixes this.

android-configure.sh

diff --git a/android-configure.sh b/android-configure.sh
index ad77bd2..36b5e9a 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -599,7 +599,7 @@
     echo "HOST_OS   := windows" >> $config_mk
 fi
 
-if [ "$GLES_INCLUDE" -a "$GLES_LIBS" ]; then
+if [ "$GLES_SUPPORT" = "yes" -a "$GLES_INCLUDE" -a "$GLES_LIBS" ]; then
     echo "QEMU_OPENGLES_INCLUDE    := $GLES_INCLUDE" >> $config_mk
     echo "QEMU_OPENGLES_LIBS       := $GLES_LIBS"    >> $config_mk
 fi
@@ -725,7 +725,7 @@
 
 echo "#define CONFIG_ANDROID       1" >> $config_h
 
-if [ "$GLES_INCLUDE" -a "$GLES_LIBS" ]; then
+if [ "$GLES_SUPPORT" = "yes" ]; then
     echo "#define CONFIG_ANDROID_OPENGLES 1" >> $config_h
 fi