Index: Servers/Filters/CMakeLists.txt
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/Servers/Filters/CMakeLists.txt,v
retrieving revision 1.154
diff -u -b -r1.154 CMakeLists.txt
--- Servers/Filters/CMakeLists.txt	10 Sep 2007 13:14:49 -0000	1.154
+++ Servers/Filters/CMakeLists.txt	10 Oct 2007 11:35:17 -0000
@@ -201,9 +201,9 @@
 # The following was copy/paste from vtkIncludeDirectories.cmake
 # OpenGL include directories.
 IF(APPLE)
-  IF(VTK_USE_X)
+#  IF(VTK_USE_X)
     INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
-  ENDIF(VTK_USE_X)
+#  ENDIF(VTK_USE_X)
 ELSE(APPLE)
   INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
 ENDIF(APPLE)
Index: VTK/vtkToolkits.h.in
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/VTK/vtkToolkits.h.in,v
retrieving revision 1.54
diff -u -b -r1.54 vtkToolkits.h.in
--- VTK/vtkToolkits.h.in	14 Aug 2007 13:46:35 -0000	1.54
+++ VTK/vtkToolkits.h.in	10 Oct 2007 11:35:18 -0000
@@ -111,7 +111,7 @@
      (defined(VTK_USE_X) && defined(_WIN32)) || \
      (defined(VTK_USE_MANGLED_MESA) && !defined(_WIN32))) && \
      !(defined (VTK_USE_CARBON) || defined(VTK_USE_COCOA))
-# define VTK_USE_OGLR
+/*# define VTK_USE_OGLR*/
 #endif
 
 #if (defined(VTK_OPENGL_HAS_OSMESA) && !defined(VTK_USE_OGLR) &&  \
Index: VTK/Rendering/CMakeLists.txt
===================================================================
RCS file: /cvsroot/ParaView3/ParaView3/VTK/Rendering/CMakeLists.txt,v
retrieving revision 1.266
diff -u -b -r1.266 CMakeLists.txt
--- VTK/Rendering/CMakeLists.txt	4 Oct 2007 12:55:13 -0000	1.266
+++ VTK/Rendering/CMakeLists.txt	10 Oct 2007 11:35:20 -0000
@@ -369,6 +369,10 @@
       SET(KitOpenGL_SRCS ${KitOpenGL_SRCS} vtkXOpenGLRenderWindow.cxx)
       SET (KIT_LIBS ${KIT_LIBS} "-lGL")
     ENDIF(VTK_USE_X  AND  OPENGL_gl_LIBRARY)
+    IF (VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
+      SET(KitOpenGL_SRCS ${KitOpenGL_SRCS} vtkOSOpenGLRenderWindow.cxx)
+      SET (KIT_LIBS ${KIT_LIBS} ${OSMESA_LIBRARY} )
+    ENDIF (VTK_OPENGL_HAS_OSMESA  AND  OSMESA_LIBRARY)
   ELSE (APPLE)
     IF (OPENGL_gl_LIBRARY)
       SET(KitOpenGL_SRCS ${KitOpenGL_SRCS} vtkXOpenGLRenderWindow.cxx)