Index: src/osxlib.cpp
===================================================================
--- src/osxlib.cpp	(revision 833)
+++ src/osxlib.cpp	(working copy)
@@ -1,6 +1,6 @@
 #include "config.hpp"
 // ---------------------------------------------------------------------------
-#ifdef RGL_CARBON
+#ifdef RGL_COCOA
 // ---------------------------------------------------------------------------
 #include "lib.hpp"
 // ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
   assert(gGUIFactory == 0);
   gGUIFactory = new gui::OSXGUIFactory();
   if (!gGUIFactory->hasEventLoop()) {
-	Rprintf("RGL: configured for Carbon/Cocoa, must run in R.app\n");
+	Rprintf("RGL: configured for Cocoa, must run in R.app\n");
 	return false;
   } else return true;
 }
@@ -47,7 +47,7 @@
 // ---------------------------------------------------------------------------
 } // namespace lib
 // ---------------------------------------------------------------------------
-#endif // RGL_CARBON
+#endif // RGL_COCOA
 // ---------------------------------------------------------------------------
 
 
Index: src/opengl.hpp
===================================================================
--- src/opengl.hpp	(revision 833)
+++ src/opengl.hpp	(working copy)
@@ -8,8 +8,8 @@
 #include "config.hpp"
 // ---------------------------------------------------------------------------
 #ifdef RGL_OSX
-#include <AGL/gl.h>
-#include <AGL/glu.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
 #endif
 // ---------------------------------------------------------------------------
 #ifdef RGL_W32
Index: src/Makevars.in
===================================================================
--- src/Makevars.in	(revision 833)
+++ src/Makevars.in	(working copy)
@@ -29,7 +29,7 @@
 	-mv x11*.o osx*.o Temp
 	mkdir -p AGL
 	-mv AGL/* .
-	MAKINGAGL=TRUE $(R_HOME)/bin/R CMD SHLIB  -o $@ *.cpp *.c
+	MAKINGAGL=TRUE $(R_HOME)/bin/R CMD SHLIB  -o $@ *.mm *.cpp *.c
 	mv x11*.o osx*.o AGL
 	mv Temp/* .
 	rm -rf Temp
Index: src/config.hpp
===================================================================
--- src/config.hpp	(revision 833)
+++ src/config.hpp	(working copy)
@@ -5,8 +5,8 @@
 // ---------------------------------------------------------------------------
 #if defined(__APPLE__)
 # define RGL_OSX 1
-# if defined(RGL_USE_CARBON)
-#  define RGL_CARBON 1
+# if defined(RGL_USE_COCOA)
+#  define RGL_COCOA 1
 # else
 #  define RGL_X11 1
 # endif
Index: configure.ac
===================================================================
--- configure.ac	(revision 833)
+++ configure.ac	(working copy)
@@ -26,8 +26,8 @@
 AC_PROG_CPP
 AC_PROG_CC
 
-AC_ARG_ENABLE([carbon],
-[  --disable-carbon           os x: use X11 instead of Carbon]
+AC_ARG_ENABLE([cocoa],
+[  --disable-cocoa            use X11 instead of Mac OS X native Cocoa UI]
 )
 
 if test `uname` = "Darwin" ; then
@@ -98,9 +98,9 @@
 
 ## --- Darwin ----------------------------------------------------------------
 
-if test x$darwin == "xyes" -a "x$enable_carbon" != "xno" -a x$have_64bit == "xno" ; then
-  AGLCPPFLAGS="${CPPFLAGS} -DRGL_USE_CARBON -I/System/Library/Frameworks/AGL.framework/Headers"
-  AGLLIBS="${LIBS} -framework AGL"
+if test x$darwin == "xyes" -a "x$enable_cocoa" != "xno" ; then
+  AGLCPPFLAGS="${CPPFLAGS} -DRGL_USE_COCOA"
+  AGLLIBS="${LIBS} -framework Cocoa"
   BUILD_AGL_TRUE=""
 else
   BUILD_AGL_TRUE="#"
Index: README
===================================================================
--- README	(revision 833)
+++ README	(working copy)
@@ -138,7 +138,7 @@
   MAC OS X OPTIONS
   ----------------
 
-  --disable-carbon
+  --disable-cocoa
     force a X11 port