Index: Modules/FindGLUT.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindGLUT.cmake,v
retrieving revision 1.20
diff -u -r1.20 FindGLUT.cmake
--- Modules/FindGLUT.cmake	13 Mar 2008 14:56:40 -0000	1.20
+++ Modules/FindGLUT.cmake	1 Aug 2008 14:11:01 -0000
@@ -26,23 +26,31 @@
     SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
   ELSE (APPLE)
     
-    FIND_PATH( GLUT_INCLUDE_DIR GL/glut.h
-      /usr/include/GL
+    FIND_PATH( GLUT_INCLUDE_DIR glut.h
+      /usr/include
+      /usr/local/include
       /usr/openwin/share/include
       /usr/openwin/include
       /opt/graphics/OpenGL/include
       /opt/graphics/OpenGL/contrib/libglut
+      PATH_SUFFIXES GL/
       )
   
     FIND_LIBRARY( GLUT_glut_LIBRARY glut
+      /usr/lib
+      /usr/local/lib
       /usr/openwin/lib
       )
     
     FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
+      /usr/lib
+      /usr/local/lib
       /usr/openwin/lib
       )
     
     FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
+      /usr/lib
+      /usr/local/lib
       /usr/openwin/lib
       )