improve (free)glut version identification

Author: bfree-github

Makefile.PL

@@ -902,19 +902,23 @@ sub get_extensions
   print GLEXC "// OpenGL v".$gldata->{VERSION}.", using ";
 
   # Fix GLUT flags based on results
-  if ($gldata->{GLUT} > 0)
+  if ($gldata->{FREEGLUT})
   {
-    print 'Found FreeGLUT v'.$gldata->{GLUT}."\n";
-    print GLEXC 'FreeGLUT v'.$gldata->{GLUT}."\n";
+    print 'Found FreeGLUT v'.$gldata->{FREEGLUT}."\n";
+    print GLEXC 'FreeGLUT v'.$gldata->{FREEGLUT}."\n";
 
     if (!$found->{FREEGLUT} && !$found->{FREEGLUT32})
     {
       $found->{FREEGLUT} = $lib;
     }
   }
+  elsif ($gldata->{GLUT})
+  {
+    print "Found GLUT - Version: $gldata->{GLUT}\n";
+  }
   else
   {
-    print "Found GLUT - unknown version\n";
+    print "Found no GLUT\n"
   }
 
   my $GL_VERSION;

Release_Notes

@@ -30,6 +30,8 @@ Highlights:
 
   * Improved FREEGLUT searching/linking for Linux and Mac OS X.
 
+  * Fixed/improved GLUT version reporting in util/glversion.c.
+
   * Enhanced test.pl for OpenGL::Shader and VBOs
 
   * suppress osx 10.9 deprecation warnings

utils/glversion.c

@@ -31,22 +31,26 @@ int main(int argc, char **argv)
   char *renderer = NULL;
   char *extensions = NULL;
   GLuint idWindow = 0;
-  int	glutVersion;
+  int	freeglutVersion;
 
   glutInit(&argc, argv);
   glutInitWindowSize(1,1);
   glutInitDisplayMode(GLUT_RGBA);
   idWindow = glutCreateWindow(PROGRAM);
   glutHideWindow();
 
-  glutVersion = glutGet(0x01FC);
   version =     (char*)glGetString(GL_VERSION);
   vendor =      (char*)glGetString(GL_VENDOR);
   renderer =    (char*)glGetString(GL_RENDERER);
   extensions =  (char*)glGetString(GL_EXTENSIONS);
 
-  printf("GLUT=%d\nVERSION=%s\nVENDOR=%s\nRENDERER=%s\nEXTENSIONS=%s\n",
-    glutVersion,version,vendor,renderer,extensions);
+  freeglutVersion = glutGet(0x01FC);
+  if(freeglutVersion != -1) {
+    printf("FREEGLUT=%d\n", freeglutVersion);
+  }
+  printf("GLUT=%d\n", GLUT_API_VERSION);
+
+  printf("VERSION=%s\nVENDOR=%s\nRENDERER=%s\nEXTENSIONS=%s\n", version, vendor, renderer, extensions);
 
   glutDestroyWindow(idWindow);
   return(0);