fixed build problems when OpenGL libs were not in the same directory

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

Makefile.in

@@ -324,7 +324,7 @@ $(build_libdir)/@WX_LIBRARY_NAME_SHARED@: $(OBJECTS)
 #     but this seems to result in problems with libwx_gtk being linked in twice
 $(build_libdir)/@WX_LIBRARY_NAME_SHARED_GL@: glcanvas.o $(build_libdir)/@WX_LIBRARY_NAME_SHARED@
 	@$(INSTALL) -d $(build_libdir)
-	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(OPENGLLIBS)
+	$(SHARED_LD) $@ $(SONAME_FLAGS_GL) glcanvas.o $(EXTRALIBS) $(LDFLAGS_GL) $(OPENGLLIBS)
 
 $(build_libdir)/@WX_RESOURCES_MACOSX_DATA@: $(MACRESOURCES)
 	@$(INSTALL) -d $(build_libdir)

docs/changes.txt

@@ -187,6 +187,10 @@ Generic:
 
 - wxListCtrl: respect wxLC_NO_HEADER style when inserting first column
 
+Unix:
+
+- fixed build problems with OpenGL when libGL(U) were in different directories
+
 
 2.4.1
 -----

src/make.env.in

@@ -14,6 +14,7 @@
 # see comment near LDFLAGS at the end of file
 EXTRALIBS = @LDFLAGS@ @LDFLAGS_VERSIONING@ @LIBS@ @DMALLOC_LIBS@
 OPENGLLIBS = @OPENGL_LIBS@
+LDFLAGS_GL = @LDFLAGS_GL@
 LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
 
 TOOLKIT = @TOOLKIT@