diff --git a/var/spack/repos/builtin/packages/cairo/package.py b/var/spack/repos/builtin/packages/cairo/package.py
index 7a4defc10e1..ba9263dadf7 100644
--- a/var/spack/repos/builtin/packages/cairo/package.py
+++ b/var/spack/repos/builtin/packages/cairo/package.py
@@ -90,6 +90,7 @@ def check(self):
         """The checks are only for the cairo devs: They write others shouldn't bother"""
         pass
 
+
 class MesonBuilder(spack.build_systems.meson.MesonBuilder):
     def meson_args(self):
         args = ["-Dtee=enabled"]
@@ -99,12 +100,12 @@ def meson_args(self):
         else:
             args.extend(["-Dxlib=disabled", "-Dxcb=disabled"])
 
-        args.append("-Dzlib=" + ("enabled" if "pdf" in self.spec else "disabled"))
-        args.append("-Dpng=" + ("enabled" if ("png" in self.spec or "svg" in self.spec) else "disabled"))
-        args.append("-Dfreetype=" + ("enabled" if "ft" in self.spec else "disabled"))
-        args.append("-Dfontconfig=" + ("enabled" if "fc" in self.spec else "disabled"))
-        args.append("-Ddefault_library=" + ("shared" if "shared" in self.spec else "static"))
-        args.append("-Db_staticpic=" + ("true" if "pic" in self.spec else "false"))
+        args.append("-Dzlib=" + ("enabled" if "+pdf" in self.spec else "disabled"))
+        args.append("-Dpng=" + ("enabled" if ("+png" in self.spec or "+svg" in self.spec) else "disabled"))
+        args.append("-Dfreetype=" + ("enabled" if "+ft" in self.spec else "disabled"))
+        args.append("-Dfontconfig=" + ("enabled" if "+fc" in self.spec else "disabled"))
+        args.append("-Ddefault_library=" + ("shared" if "+shared" in self.spec else "static"))
+        args.append("-Db_staticpic=" + ("true" if "+pic" in self.spec else "false"))
 
         return args