diff options
Diffstat (limited to 'var/spack/repos/builtin/packages/graphviz/package.py')
| -rw-r--r-- | var/spack/repos/builtin/packages/graphviz/package.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/graphviz/package.py b/var/spack/repos/builtin/packages/graphviz/package.py index 743e8093ac..658a6a39b4 100644 --- a/var/spack/repos/builtin/packages/graphviz/package.py +++ b/var/spack/repos/builtin/packages/graphviz/package.py @@ -103,7 +103,7 @@ class Graphviz(AutotoolsPackage): depends_on(lang, when=("+" + lang)) # Feature dependencies - depends_on("zlib") + depends_on("zlib-api") depends_on("groff", type="build", when="+doc") depends_on("ghostscript", type="build", when="+doc") depends_on("expat", when="+expat") @@ -193,11 +193,15 @@ class Graphviz(AutotoolsPackage): "x", ]: args += self.with_or_without(var) - for var in ["zlib", "expat", "java"]: + for var in ("expat", "java"): if "+" + var in spec: args.append("--with-{0}includedir={1}".format(var, spec[var].prefix.include)) args.append("--with-{0}libdir={1}".format(var, spec[var].prefix.lib)) + if "+zlib" in spec: + args.append("--with-zlibincludedir={}".format(spec["zlib-api"].prefix.include)) + args.append("--with-zliblibdir={}".format(spec["zlib-api"].prefix.lib)) + args.append("--{0}-gtk".format("with" if "+gtkplus" in spec else "without")) if spec.version >= Version("2.46"): |