--- lib/wx/configure.orig
+++ lib/wx/configure
@@ -6116,10 +6116,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef WIN32
 		# include <windows.h>
 	        # include <gl/gl.h>
-	        #elif defined(HAVE_GL_GL_H)
-	        # include <GL/gl.h>
                 #elif defined(HAVE_OPENGL_GL_H)
 		# include <OpenGL/gl.h>
+	        #elif defined(HAVE_GL_GL_H)
+	        # include <GL/gl.h>
 		#endif
 
 
@@ -6189,10 +6189,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef WIN32
 		# include <windows.h>
 	        # include <gl/gl.h>
-	        #elif defined(HAVE_GL_GL_H)
-	        # include <GL/gl.h>
                 #elif defined(HAVE_OPENGL_GL_H)
 		# include <OpenGL/gl.h>
+	        #elif defined(HAVE_GL_GL_H)
+	        # include <GL/gl.h>
 		#endif
 
 
@@ -6262,10 +6262,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef WIN32
 		# include <windows.h>
 	        # include <gl/gl.h>
-	        #elif defined(HAVE_GL_GL_H)
-	        # include <GL/gl.h>
                 #elif defined(HAVE_OPENGL_GL_H)
 		# include <OpenGL/gl.h>
+	        #elif defined(HAVE_GL_GL_H)
+	        # include <GL/gl.h>
 		#endif
 
 
@@ -6335,10 +6335,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef WIN32
 		# include <windows.h>
 	        # include <gl/gl.h>
-	        #elif defined(HAVE_GL_GL_H)
-	        # include <GL/gl.h>
                 #elif defined(HAVE_OPENGL_GL_H)
 		# include <OpenGL/gl.h>
+	        #elif defined(HAVE_GL_GL_H)
+	        # include <GL/gl.h>
 		#endif
 
 
@@ -6408,10 +6408,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef WIN32
 		# include <windows.h>
 	        # include <gl/gl.h>
-	        #elif defined(HAVE_GL_GL_H)
-	        # include <GL/gl.h>
                 #elif defined(HAVE_OPENGL_GL_H)
 		# include <OpenGL/gl.h>
+	        #elif defined(HAVE_GL_GL_H)
+	        # include <GL/gl.h>
 		#endif
 
 
@@ -6481,10 +6481,10 @@ cat >>conftest.$ac_ext <<_ACEOF
 #ifdef WIN32
 		# include <windows.h>
 	        # include <gl/gl.h>
-	        #elif defined(HAVE_GL_GL_H)
-	        # include <GL/gl.h>
                 #elif defined(HAVE_OPENGL_GL_H)
 		# include <OpenGL/gl.h>
+	        #elif defined(HAVE_GL_GL_H)
+	        # include <GL/gl.h>
 		#endif
 
 
@@ -6564,10 +6564,10 @@ cat >>conftest.$ac_ext <<_ACEOF
                 #ifdef WIN32
 		# include <windows.h>
 	        # include <gl/glu.h>
-	        #elif defined(HAVE_GL_GL_H)
-	        # include <GL/glu.h>
                 #elif defined(HAVE_OPENGL_GL_H)
 		# include <OpenGL/glu.h>
+	        #elif defined(HAVE_GL_GL_H)
+	        # include <GL/glu.h>
 		#endif
 		#ifndef CALLBACK
 		# define CALLBACK