From 26d6151ea149805df17d59c32f60934a5550ff51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Fri, 4 Apr 2014 09:19:39 +0200
Subject: [PATCH] configure: Fix check for iOS for the OpenGL support

There is also an i386 version of iOS, which is for the simulator.
Better use our already existing HAVE_IOS check instead of relying
on the host triplet.
---
 configure.ac | 73 ++++++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/configure.ac b/configure.ac
index e7c0d8eca2..6ae6f9427b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -958,44 +958,49 @@ case $host in
       fi
     fi
     ;;
-  i386*-darwin* | x86_64*-darwin*)
-    dnl Only osx supports cocoa. ios requires EAGL.
-    if test "x$NEED_WGL" = "xyes"; then
-      AC_MSG_ERROR([WGL is not available on Mac OS X])
-    fi
-    if test "x$NEED_EGL" = "xyes"; then
-      AC_MSG_ERROR([EGL is not available on Mac OS X])
-    fi
-    if test "x$NEED_GLES2" = "xyes"; then
-      AC_MSG_ERROR([OpenGL|ES 2.0 is not supported on your platform yet])
-    fi
-
-    if test "x$NEED_COCOA" != "xno"; then
-      GL_LIBS="$LIBS -framework OpenGL -framework Cocoa"
-      GL_CFLAGS="$GL_CFLAGS"
-      USE_COCOA=yes
-      HAVE_WINDOW_COCOA=yes
-      USE_OPENGL=yes
-    fi
-
-    if test "x$USE_GLX" = "xyes"; then
-      if test "x$HAVE_X" = "xyes"; then
-        if test "x$NEED_X11" != "xno"; then
-          GL_LIBS="$GL_LIBS $X_LIBS"
-          GL_CFLAGS="$GL_CFLAGS $X_CFLAGS"
-          HAVE_WINDOW_X11=yes
-        fi
+  *-darwin*)
+    if test "x$HAVE_IOS" = "xyes"; then
+      dnl iOS requires EAGL, which we don't support yet
+      AC_MSG_WARN([OpenGL support not ported to iOS yet])
+    else
+      dnl Only osx supports cocoa.
+      if test "x$NEED_WGL" = "xyes"; then
+        AC_MSG_ERROR([WGL is not available on Mac OS X])
+      fi
+      if test "x$NEED_EGL" = "xyes"; then
+        AC_MSG_ERROR([EGL is not available on Mac OS X])
+      fi
+      if test "x$NEED_GLES2" = "xyes"; then
+        AC_MSG_ERROR([OpenGL|ES 2.0 is not supported on your platform yet])
       fi
 
-      if test "x$HAVE_GL" = "xyes"; then
-        if test "x$NEED_GL" != "xno"; then
-          GL_LIBS="$GL_LIBS -lGL"
-        fi
-        if test "x$HAVE_GLU" = "xyes"; then
-          GL_LIBS="$GL_LIBS -lGLU"
-        fi
+      if test "x$NEED_COCOA" != "xno"; then
+        GL_LIBS="$LIBS -framework OpenGL -framework Cocoa"
+        GL_CFLAGS="$GL_CFLAGS"
+        USE_COCOA=yes
+        HAVE_WINDOW_COCOA=yes
         USE_OPENGL=yes
       fi
+
+      if test "x$USE_GLX" = "xyes"; then
+        if test "x$HAVE_X" = "xyes"; then
+          if test "x$NEED_X11" != "xno"; then
+            GL_LIBS="$GL_LIBS $X_LIBS"
+            GL_CFLAGS="$GL_CFLAGS $X_CFLAGS"
+            HAVE_WINDOW_X11=yes
+          fi
+        fi
+
+        if test "x$HAVE_GL" = "xyes"; then
+          if test "x$NEED_GL" != "xno"; then
+            GL_LIBS="$GL_LIBS -lGL"
+          fi
+          if test "x$HAVE_GLU" = "xyes"; then
+            GL_LIBS="$GL_LIBS -lGLU"
+          fi
+          USE_OPENGL=yes
+        fi
+      fi
     fi
     ;;
   *-mingw32*)