Where's GL? Hopefully wx-config will now tell us if we need to know.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

configure.in

@@ -2312,25 +2312,42 @@ if test "$wxUSE_OPENGL" = "yes"; then
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     else
 
+        AC_CHECK_HEADER(GL/gl.h,
+            [
+                WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[GL])
+                if test "$ac_find_libraries" != "" ; then
+                    WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                    LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+                    OPENGL_LIBS="-lGL -lGLU"
+                else
+                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[MesaGL])
+                    if test "$ac_find_libraries" != "" ; then
+                        WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
+                    fi
+                fi
+            ])
+
     dnl check for OpenGL libs availability first
     dnl -lGL requires -lm with soem OpenGL versions
 
-    AC_CHECK_HEADER(GL/gl.h,
+#    AC_CHECK_HEADER(GL/gl.h,
-        [
+#        [
-            AC_CHECK_LIB(GL, glFlush,
+#            AC_CHECK_LIB(GL, glFlush,
-                [
+#                [
-                    OPENGL_LIBS="-lGL -lGLU"
+#                    OPENGL_LIBS="-lGL -lGLU"
-                ],
+#                ],
-                [
+#                [
-                    AC_CHECK_LIB(MesaGL, glFlush,
+#                    AC_CHECK_LIB(MesaGL, glFlush,
-                        [
+#                        [
-                            OPENGL_LIBS="-lMesaGL -lMesaGLU"
+#                            OPENGL_LIBS="-lMesaGL -lMesaGLU"
-                        ],
+#                        ],
-                        [],
+#                        [],
-                        [-lm])
+#                        [-lm])
-                ],
+#                ],
-                [-lm])
+#                [-lm])
-        ])
+#        ])
 
         if test "x$OPENGL_LIBS" = "x"; then
             dnl it should be an error and not a warning because OpenGL is not on
@@ -4774,6 +4791,7 @@ AC_SUBST(SAMPLES_SUBDIRS)
 
 dnl additional libraries and linker settings
 AC_SUBST(LDFLAGS)
+AC_SUBST(LDFLAGS_GL)
 AC_SUBST(OPENGL_LIBS)
 AC_SUBST(DMALLOC_LIBS)
 AC_SUBST(EXTRADEFS)

wx-config.in

@@ -107,7 +107,7 @@ while test $# -gt 0; do
 
       ;;
     --gl-libs)
-      echo @WXCONFIG_LIBS_GL@
+      echo @LDFLAGS_GL@ @WXCONFIG_LIBS_GL@
       ;;
     --cc)
       echo $CC