diff --git a/mozilla/configure.in b/mozilla/configure.in
index 9fbccdace6f..16251305a03 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -6426,30 +6426,32 @@ if test "$MOZ_LDAP_XPCOM"; then
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 fi
 
-if test -z "$MOZ_SYSTEM_CAIRO"; then
-    # these subdirs may not yet have been created in the build tree.
-    # don't use the "-p" switch to mkdir, since not all platforms have it
-    #
-    if test ! -d "gfx/cairo"; then
-        mkdir "gfx/cairo"
-    fi
-    if test ! -d "gfx/cairo/libpixman"; then
-        mkdir "gfx/cairo/libpixman"
-    fi
-    if test ! -d "gfx/cairo/cairo"; then
-        mkdir "gfx/cairo/cairo"
-    fi
+if test "$MOZ_SVG_RENDERER_CAIRO" -o "$MOZ_ENABLE_CAIRO" ; then
+    if test -z "$MOZ_SYSTEM_CAIRO"; then
+        # these subdirs may not yet have been created in the build tree.
+        # don't use the "-p" switch to mkdir, since not all platforms have it
+        #
+        if test ! -d "gfx/cairo"; then
+            mkdir "gfx/cairo"
+        fi
+        if test ! -d "gfx/cairo/libpixman"; then
+            mkdir "gfx/cairo/libpixman"
+        fi
+        if test ! -d "gfx/cairo/cairo"; then
+            mkdir "gfx/cairo/cairo"
+        fi
 
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --includedir=$MOZ_BUILD_ROOT/dist/include/cairo"
-    AC_OUTPUT_SUBDIRS(gfx/cairo/libpixman)
+        ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --includedir=$MOZ_BUILD_ROOT/dist/include/cairo"
+        AC_OUTPUT_SUBDIRS(gfx/cairo/libpixman)
 
-    export PKG_CONFIG_PATH=$MOZ_BUILD_ROOT/gfx/cairo/libpixman
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --disable-ps --disable-pdf --disable-png --disable-glitz --disable-xcb"
+        export PKG_CONFIG_PATH=$MOZ_BUILD_ROOT/gfx/cairo/libpixman
+        ac_configure_args="$_SUBDIR_CONFIG_ARGS --prefix=$MOZ_BUILD_ROOT/dist --disable-ps --disable-pdf --disable-png --disable-glitz --disable-xcb"
 
-    if test -n "$MACOSX"; then
-        ac_configure_args="$ac_configure_args --disable-freetype --disable-xlib"
+        if test -n "$MACOSX"; then
+            ac_configure_args="$ac_configure_args --disable-freetype --disable-xlib"
+        fi
+
+        AC_OUTPUT_SUBDIRS(gfx/cairo/cairo)
+        ac_configure_args="$_SUBDIR_CONFIG_ARGS"
     fi
-
-    AC_OUTPUT_SUBDIRS(gfx/cairo/cairo)
-    ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 fi