Move this system-mesa-headers test inside opengl extension test

Here it only gets used for non-Windows and non-Linux. It will current defaults
to using these "internal" headers like we do for xrender and friends.

1 files changed, 30 insertions, 31 deletions

diff --git a/configure.in b/configure.in
index 89dffcdeba44..760d00f38941 100755
--- a/configure.in
+++ b/configure.in
@@ -5508,27 +5508,6 @@ AC_SUBST(XRANDR_LIBS)
 AC_SUBST(ENABLE_RANDR)
 
 dnl ===================================================================
-dnl Check for system Mesa
-dnl ===================================================================
-AC_MSG_CHECKING([which Mesa headers to use])
-if test -n "$with_system_mesa_headers" -o -n "$with_system_headers" && \
-    test "$with_system_mesa_headers" != "no"; then
-   AC_MSG_RESULT([external])
-   SYSTEM_MESA_HEADERS=YES
-   AC_LANG_PUSH(C)
-   AC_CHECK_HEADER(GL/glxext.h, [],
-      [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
-   AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
-   AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
-   AC_LANG_POP(C)
-else
-   AC_MSG_RESULT([internal])
-   SYSTEM_MESA_HEADERS=NO
-   BUILD_TYPE="$BUILD_TYPE MESA"
-fi
-AC_SUBST(SYSTEM_MESA_HEADERS)
-
-dnl ===================================================================
 dnl Check for building neon
 dnl ===================================================================
 AC_MSG_CHECKING([whether to use neon])
@@ -6323,16 +6302,35 @@ else
    if test "x$enable_opengl" != "xno" ; then
       if test "$_os" != "WINNT"; then
          save_LDFLAGS=$LDFLAGS
-        LDFLAGS="$LDFLAGS -lm"
-        AC_MSG_RESULT([yes])
-        AC_CHECK_HEADER(GL/gl.h, [],
-                     [AC_MSG_ERROR([OpenGL headers not found])], [])
-        AC_CHECK_LIB(GL, main, [],
-                     [AC_MSG_ERROR(libGL not installed or functional)], [])
-        AC_CHECK_LIB(GLU, main, [],
-                     [AC_MSG_ERROR(libGLU not installed or functional)], [])
-        ENABLE_OPENGL=TRUE
-        LDFLAGS=$save_LDFLAGS
+         LDFLAGS="$LDFLAGS -lm"
+         AC_MSG_RESULT([yes])
+         AC_CHECK_LIB(GL, main, [],
+                      [AC_MSG_ERROR(libGL not installed or functional)], [])
+         AC_CHECK_LIB(GLU, main, [],
+                      [AC_MSG_ERROR(libGLU not installed or functional)], [])
+         ENABLE_OPENGL=TRUE
+         LDFLAGS=$save_LDFLAGS
+
+         dnl ===================================================================
+         dnl Check for system Mesa
+         dnl ===================================================================
+         AC_MSG_CHECKING([which Mesa headers to use])
+         if test -n "$with_system_mesa_headers" -o -n "$with_system_headers" && \
+            test "$with_system_mesa_headers" != "no"; then
+            AC_MSG_RESULT([external])
+            SYSTEM_MESA_HEADERS=YES
+            AC_LANG_PUSH(C)
+            AC_CHECK_HEADER(GL/glxext.h, [],
+               [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
+            AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
+            AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
+            AC_LANG_POP(C)
+         else
+            AC_MSG_RESULT([internal])
+            SYSTEM_MESA_HEADERS=NO
+            BUILD_TYPE="$BUILD_TYPE MESA"
+        fi
+
       else
         AC_MSG_RESULT([not on windows])
       fi
@@ -6341,6 +6339,7 @@ else
    fi
 fi
 
+AC_SUBST(SYSTEM_MESA_HEADERS)
 AC_SUBST(ENABLE_OPENGL)
 
 # presenter extra ui extension?