--- cmake-2.8.3/Modules/FindOpenGL.cmake	2010-11-03 15:58:27.000000000 -0400
+++ cadtoplevel/brlcad/cmake/misc/CMake/FindGL.cmake	2010-12-19 12:36:44.000000000 -0500
@@ -4,16 +4,17 @@
 #  OPENGL_FOUND        - system has OpenGL
 #  OPENGL_XMESA_FOUND  - system has XMESA
 #  OPENGL_GLU_FOUND    - system has GLU
-#  OPENGL_INCLUDE_DIR  - the GL include directory
+#  OPENGL_INCLUDE_DIR_GL   - the GL include directory
+#  OPENGL_INCLUDE_DIR_GLX  - the GLX include directory
 #  OPENGL_LIBRARIES    - Link these to use OpenGL and GLU
 #   
 # If you want to use just GL you can use these values
 #  OPENGL_gl_LIBRARY   - Path to OpenGL Library
 #  OPENGL_glu_LIBRARY  - Path to GLU Library
 #  
-# On OSX default to using the framework version of opengl
-# People will have to change the cache values of OPENGL_glu_LIBRARY 
-# and OPENGL_gl_LIBRARY to use OpenGL with X11 on OSX
+# Define controlling option OPENGL_USE_AQUA if on Apple - 
+# if this is not true, look for the X11 OpenGL.  Defaults
+# to true.
 
 #=============================================================================
 # Copyright 2001-2009 Kitware, Inc.
@@ -31,7 +32,7 @@
 IF (WIN32)
   IF (CYGWIN)
 
-    FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h )
+                FIND_PATH(OPENGL_INCLUDE_DIR_GL GL/gl.h )
 
     FIND_LIBRARY(OPENGL_gl_LIBRARY opengl32 )
 
@@ -52,12 +53,14 @@
 ELSE (WIN32)
 
   IF (APPLE)
+    OPTION(OPENGL_USE_AQUA "Require native OSX Framework version of OpenGL." ON)
+  ENDIF(APPLE)
 
+  IF(OPENGL_USE_AQUA)
     FIND_LIBRARY(OPENGL_gl_LIBRARY OpenGL DOC "OpenGL lib for OSX")
     FIND_LIBRARY(OPENGL_glu_LIBRARY AGL DOC "AGL lib for OSX")
-    FIND_PATH(OPENGL_INCLUDE_DIR OpenGL/gl.h DOC "Include for OpenGL on OSX")
-
-  ELSE(APPLE)
+    FIND_PATH(OPENGL_INCLUDE_DIR_GL OpenGL/gl.h DOC "Include for OpenGL on OSX")
+  ELSE(OPENGL_USE_AQUA)
     # Handle HP-UX cases where we only want to find OpenGL in either hpux64
     # or hpux32 depending on if we're doing a 64 bit build.
     IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
@@ -76,7 +79,13 @@
     # Make sure the NVIDIA directory comes BEFORE the others.
     #  - Atanas Georgiev <atanas@cs.columbia.edu>
 
-    FIND_PATH(OPENGL_INCLUDE_DIR GL/gl.h
+    FIND_PATH(OPENGL_INCLUDE_DIR_GL GL/gl.h
+      /usr/share/doc/NVIDIA_GLX-1.0/include
+      /usr/openwin/share/include
+      /opt/graphics/OpenGL/include /usr/X11R6/include
+      )
+
+    FIND_PATH(OPENGL_INCLUDE_DIR_GLX GL/glx.h
       /usr/share/doc/NVIDIA_GLX-1.0/include
       /usr/openwin/share/include
       /opt/graphics/OpenGL/include /usr/X11R6/include
@@ -106,9 +115,7 @@
         INCLUDE(FindX11)
       ENDIF(NOT X11_FOUND)
       IF (X11_FOUND)
-        IF (NOT APPLE)
           SET (OPENGL_LIBRARIES ${X11_LIBRARIES})
-        ENDIF (NOT APPLE)
       ENDIF (X11_FOUND)
     ENDIF (OPENGL_gl_LIBRARY)
 
@@ -119,8 +126,8 @@
             /usr/openwin/lib
             /usr/shlib /usr/X11R6/lib
     )
+  ENDIF(OPENGL_USE_AQUA)
 
-  ENDIF(APPLE)
 ENDIF (WIN32)
 
 SET( OPENGL_FOUND "NO" )