diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 2fc83e615e7..093f9e8d03d 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -187,7 +187,7 @@ MOZ_SVG_RENDERER_GDIPLUS = @MOZ_SVG_RENDERER_GDIPLUS@
 MOZ_SVG_RENDERER_LIBART = @MOZ_SVG_RENDERER_LIBART@
 MOZ_SVG_RENDERER_CAIRO = @MOZ_SVG_RENDERER_CAIRO@
 MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@
-MOZ_ENABLE_CAIRO = @MOZ_ENABLE_CAIRO@
+MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@
 MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@
 TX_EXE = @TX_EXE@
 
diff --git a/configure.in b/configure.in
index 1e5d3f49480..2dca798f9d6 100644
--- a/configure.in
+++ b/configure.in
@@ -3285,14 +3285,14 @@ fi
 
 fi # SKIP_LIBRARY_CHECKS
 
-dnl check whether to enable cairo
+dnl check whether to enable canvas
 dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(cairo,
-[  --enable-cairo          Enable Cairo-specific features (Canvas)],
-    MOZ_ENABLE_CAIRO=1,
-    MOZ_ENABLE_CAIRO= )
-if test "$MOZ_ENABLE_CAIRO"; then
-    AC_DEFINE(MOZ_ENABLE_CAIRO)
+MOZ_ARG_ENABLE_BOOL(canvas,
+[  --enable-canvas          Enable html:canvas feature],
+    MOZ_ENABLE_CANVAS=1,
+    MOZ_ENABLE_CANVAS= )
+if test "$MOZ_ENABLE_CANVAS"; then
+    AC_DEFINE(MOZ_ENABLE_CANVAS)
 fi
 
 dnl ========================================================
@@ -3415,7 +3415,6 @@ cairo-gtk2)
     MOZ_WIDGET_TOOLKIT=gtk2
     MOZ_GFX_TOOLKIT=cairo
     MOZ_ENABLE_CAIRO_GFX=1
-    MOZ_ENABLE_CAIRO=1
     MOZ_ENABLE_GTK2=1
     MOZ_ENABLE_XREMOTE=1
     TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_CAIRO_CFLAGS)'
@@ -3426,7 +3425,6 @@ cairo-xlib)
     MOZ_WIDGET_TOOLKIT=xlib
     MOZ_GFX_TOOLKIT=cairo
     MOZ_ENABLE_CAIRO_GFX=1
-    MOZ_ENABLE_CAIRO=1
 	MOZ_ENABLE_XLIB=1
 	TK_CFLAGS='$(MOZ_XLIB_CFLAGS) $(MOZ_CAIRO_FLAGS)'
 	TK_LIBS='$(MOZ_XLIB_LDFLAGS) $(MOZ_CAIRO_LIBS)'
@@ -3534,7 +3532,7 @@ AC_SUBST(GTK_CONFIG)
 AC_SUBST(TK_CFLAGS)
 AC_SUBST(TK_LIBS)
 
-AC_SUBST(MOZ_ENABLE_CAIRO)
+AC_SUBST(MOZ_ENABLE_CANVAS)
 
 AC_SUBST(MOZ_ENABLE_GTK)
 AC_SUBST(MOZ_ENABLE_XLIB)
@@ -5790,7 +5788,7 @@ AC_SUBST(MOZ_LIBART_LIBS)
 dnl ========================================================
 dnl Check for cairo
 dnl ========================================================
-if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CAIRO" ; then
+if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CANVAS" -o "$MOZ_ENABLE_CAIRO_GFX" ; then
    MOZ_CAIRO_CFLAGS='-I$(DIST)/include/cairo'
 
    MOZ_TREE_CAIRO=1
diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
index d361b7edb90..2263c18fb85 100644
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -85,7 +85,7 @@ REQUIRES	= \
 CPPSRCS		= dummy.cpp \
 		$(NULL)
 
-ifdef MOZ_ENABLE_CAIRO
+ifdef MOZ_ENABLE_CANVAS
 CPPSRCS		+= nsCanvasRenderingContext2D.cpp
 endif
 
diff --git a/dom/public/nsIDOMClassInfo.h b/dom/public/nsIDOMClassInfo.h
index 42c04658651..7bf02089491 100644
--- a/dom/public/nsIDOMClassInfo.h
+++ b/dom/public/nsIDOMClassInfo.h
@@ -326,7 +326,7 @@ enum nsDOMClassInfoID {
 
   // Canvas
   eDOMClassInfo_HTMLCanvasElement_id,
-#ifdef MOZ_ENABLE_CAIRO
+#ifdef MOZ_ENABLE_CANVAS
   eDOMClassInfo_CanvasRenderingContext2D_id,
   eDOMClassInfo_CanvasGradient_id,
   eDOMClassInfo_CanvasPattern_id,
diff --git a/dom/src/base/nsDOMClassInfo.cpp b/dom/src/base/nsDOMClassInfo.cpp
index e3f82f911bb..974dc99d80a 100644
--- a/dom/src/base/nsDOMClassInfo.cpp
+++ b/dom/src/base/nsDOMClassInfo.cpp
@@ -374,7 +374,7 @@
 #include "nsIDOMSVGZoomAndPan.h"
 #endif // MOZ_SVG
 
-#ifdef MOZ_ENABLE_CAIRO
+#ifdef MOZ_ENABLE_CANVAS
 #include "nsIDOMCanvasRenderingContext2D.h"
 #endif
 
@@ -993,14 +993,14 @@ static nsDOMClassInfoData sClassInfoData[] = {
 
   NS_DEFINE_CLASSINFO_DATA(HTMLCanvasElement, nsHTMLElementSH,
                            ELEMENT_SCRIPTABLE_FLAGS)
-#ifdef MOZ_ENABLE_CAIRO
+#ifdef MOZ_ENABLE_CANVAS
   NS_DEFINE_CLASSINFO_DATA(CanvasRenderingContext2D, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(CanvasGradient, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(CanvasPattern, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
-#endif // MOZ_ENABLE_CAIRO
+#endif // MOZ_ENABLE_CANVAS
 };
 
 nsIXPConnect *nsDOMClassInfo::sXPConnect = nsnull;
@@ -2683,7 +2683,7 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_GENERIC_HTML_MAP_ENTRIES
   DOM_CLASSINFO_MAP_END
 
-#ifdef MOZ_ENABLE_CAIRO
+#ifdef MOZ_ENABLE_CANVAS
   DOM_CLASSINFO_MAP_BEGIN(CanvasRenderingContext2D, nsIDOMCanvasRenderingContext2D)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMCanvasRenderingContext2D)
   DOM_CLASSINFO_MAP_END
@@ -2695,7 +2695,7 @@ nsDOMClassInfo::Init()
   DOM_CLASSINFO_MAP_BEGIN(CanvasPattern, nsIDOMCanvasPattern)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMCanvasPattern)
   DOM_CLASSINFO_MAP_END
-#endif // MOZ_ENABLE_CAIRO
+#endif // MOZ_ENABLE_CANVAS
 
 #ifdef NS_DEBUG
   {
diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in
index e4c558add9b..887b3c59507 100644
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -210,7 +210,7 @@ EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
 		    $(NULL)
 endif
 
-ifneq (,$(MOZ_ENABLE_CAIRO)$(MOZ_SVG_RENDERER_CAIRO))
+ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
 EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
 		    $(NULL)
 endif
diff --git a/layout/build/nsLayoutModule.cpp b/layout/build/nsLayoutModule.cpp
index 3fb688cf3e6..7102af8f187 100644
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -149,7 +149,7 @@
 
 #include "nsHTMLCanvasFrame.h"
 
-#ifdef MOZ_ENABLE_CAIRO
+#ifdef MOZ_ENABLE_CANVAS
 #include "nsIDOMCanvasRenderingContext2D.h"
 #endif
 
@@ -450,7 +450,7 @@ nsresult NS_NewIFrameBoxObject(nsIBoxObject** aResult);
 nsresult NS_NewTreeBoxObject(nsIBoxObject** aResult);
 #endif
 
-#ifdef MOZ_ENABLE_CAIRO
+#ifdef MOZ_ENABLE_CANVAS
 nsresult NS_NewCanvasRenderingContext2D(nsIDOMCanvasRenderingContext2D** aResult);
 #endif
 
@@ -602,7 +602,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDataDocumentContentPolicy)
 MAKE_CTOR(CreateSyncLoadDOMService,       nsISyncLoadDOMService,       NS_NewSyncLoadDOMService)
 MAKE_CTOR(CreatePluginDocument,           nsIDocument,                 NS_NewPluginDocument)
 
-#ifdef MOZ_ENABLE_CAIRO
+#ifdef MOZ_ENABLE_CANVAS
 MAKE_CTOR(CreateCanvasRenderingContext2D, nsIDOMCanvasRenderingContext2D, NS_NewCanvasRenderingContext2D)
 #endif
 
@@ -1063,7 +1063,7 @@ static const nsModuleComponentInfo gComponents[] = {
     RegisterHTMLOptionElement,
     UnregisterHTMLOptionElement },
 
-#ifdef MOZ_ENABLE_CAIRO
+#ifdef MOZ_ENABLE_CANVAS
   { "Canvas 2D Rendering Context",
     NS_CANVASRENDERINGCONTEXT2D_CID,
     "@mozilla.org/content/canvas-rendering-context;1?id=2d",
diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in
index 706feac6c9c..227d862f850 100644
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -66,7 +66,7 @@ REQUIRES	= xpcom \
 		  js \
 		  $(NULL)
 
-ifdef MOZ_ENABLE_CAIRO
+ifdef MOZ_ENABLE_CANVAS
 REQUIRES        += \
                 cairo \
                 libpixman \
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 4a5e1339a9f..55311bde3dd 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -326,7 +326,7 @@ ifdef MOZ_SVG_RENDERER_LIBART
 EXTRA_DSO_LDOPTS += $(MOZ_LIBART_LIBS)
 endif
 
-ifneq (,$(MOZ_ENABLE_CAIRO)$(MOZ_SVG_RENDERER_CAIRO))
+ifneq (,$(MOZ_ENABLE_CANVAS)$(MOZ_SVG_RENDERER_CAIRO))
 EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS)
 endif