diff options
| author | Mike McQuaid | 2012-09-16 21:38:28 -0700 |
|---|---|---|
| committer | Mike McQuaid | 2012-09-16 21:38:28 -0700 |
| commit | 81f9a64060cc088a5f793890de9d99f52f577b8a (patch) | |
| tree | eafcd1726aee0450d8956ba17c100990927d1d19 /Library/Formula | |
| parent | 9c6ea5370479559a7927ee281d3a68ebc923bf54 (diff) | |
| download | homebrew-81f9a64060cc088a5f793890de9d99f52f577b8a.tar.bz2 | |
imagemagick: default to not depending on freetype, x11.
freetype will be default when I bottle it in the next few days but
until then this just adds an extra unbottled dependency to the
bottle which won't be used anyway.
X11 should default to being off on everything; it's not around by
default on Lion or Mountain Lion and in this case it breaks the
bottle to depend on it.
References #14714, #14948.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/imagemagick.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Library/Formula/imagemagick.rb b/Library/Formula/imagemagick.rb index 9af4a4710..271eddedf 100644 --- a/Library/Formula/imagemagick.rb +++ b/Library/Formula/imagemagick.rb @@ -34,15 +34,15 @@ class Imagemagick < Formula option 'with-quantum-depth-8', 'Compile with a quantum depth of 8 bit' option 'with-quantum-depth-16', 'Compile with a quantum depth of 16 bit' option 'with-quantum-depth-32', 'Compile with a quantum depth of 32 bit' - option 'without-x', 'Compile without x11' - option 'without-freetype', 'Compile without freetype' + option 'with-x', 'Compile with x11' + option 'with-freetype', 'Compile with freetype' depends_on 'pkg-config' => :build depends_on 'jpeg' => :recommended depends_on :libpng - depends_on :x11 unless build.include? 'without-x' - depends_on :freetype unless build.include? 'without-freetype' + depends_on :x11 if build.include? 'with-x' + depends_on :freetype if build.include? 'with-freetype' depends_on 'ghostscript' => :optional if ghostscript_srsly? @@ -98,8 +98,8 @@ class Imagemagick < Formula args << "--with-quantum-depth=#{quantum_depth}" if quantum_depth args << "--with-rsvg" if build.include? 'use-rsvg' - args << "--without-x" if build.include? 'without-x' - args << "--with-freetype=yes" unless build.include? 'without-freetype' + args << "--without-x" unless build.include? 'with-x' + args << "--with-freetype=yes" if build.include? 'with-freetype' # versioned stuff in main tree is pointless for us inreplace 'configure', '${PACKAGE_NAME}-${PACKAGE_VERSION}', '${PACKAGE_NAME}' |