--- lib/wx/configure.orig	2009-05-05 11:06:59.000000000 -0400
+++ lib/wx/configure	2009-05-05 11:09:13.000000000 -0400
@@ -4872,10 +4872,10 @@
 #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
 
 
@@ -4945,10 +4945,10 @@
 #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
 
 
@@ -5018,10 +5018,10 @@
 #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
 
 
@@ -5091,10 +5091,10 @@
 #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
 
 
@@ -5164,10 +5164,10 @@
 #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
 
 
@@ -5237,10 +5237,10 @@
 #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
 
 
@@ -5320,10 +5320,10 @@
                 #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