diff --git a/Make/makedefs b/Make/makedefs
index 9b5e49f6d..f3fb93301 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -457,19 +457,36 @@ ifeq ($(OS),Darwin)
     C++             = $(CXX)
   endif
 
+  #### Default to AGL?  Will try it temporary while waiting for feedback
+  USE_AGL ?= yes
+
   FINC              += -F/System/Library/Frameworks
 
-  ifeq ($(USE_CGL),1)
-	 DEF            += -D__USE_OSX_CGL_IMPLEMENTATION__
-     INC            += $(FINC) 
-     LDFLAGS	    += $(FINC) 
-     X_INC          = 
-     X_LIBS         = 
+  ifeq ($(USE_AGL),yes)
+
+      DEF            += -D__USE_OSX_AGL_IMPLEMENTATION__
+      INC            += $(FINC) 
+      LDFLAGS	     += $(FINC) 
+      X_INC          = 
+      X_LIBS         = 
+
   else
-     INC            += $(FINC) -I$(SDKPATH)/usr/X11R6/include
-     LDFLAGS	    += $(FINC) -L$(SDKPATH)/usr/include -L$(SDKPATH)/usr/X11R6/lib -L/sw/lib
-     X_INC          = -I$(SDKPATH)/usr/X11R6/include
-     X_LIBS         = -lX11 
+      ifeq ($(USE_CGL),yes)
+
+	 DEF            += -D__USE_OSX_CGL_IMPLEMENTATION__
+         INC            += $(FINC) 
+         LDFLAGS	+= $(FINC) 
+         X_INC          = 
+         X_LIBS         = 
+
+      else
+
+         INC            += $(FINC) -I$(SDKPATH)/usr/X11R6/include
+         LDFLAGS	    += $(FINC) -L$(SDKPATH)/usr/include -L$(SDKPATH)/usr/X11R6/lib -L/sw/lib
+         X_INC          = -I$(SDKPATH)/usr/X11R6/include
+         X_LIBS         = -lX11 
+
+      endif
   endif
 
   DEF               += -Wall