diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py
index 5d04bf29fa7..a7e0d150b82 100644
--- a/var/spack/repos/builtin/packages/cairo/package.py
+++ b/var/spack/repos/builtin/packages/cairo/package.py
@@ -51,4 +51,8 @@ class Cairo(AutotoolsPackage):
     def configure_args(self):
         args = ["--disable-trace",  # can cause problems with libiberty
                 "--enable-tee"]
+        if '+X' in self.spec:
+            args.extend(["--enable-xlib", "--enable-xcb"])
+        else:
+            args.extend(["--disable-xlib", "--disable-xcb"])
         return args