diff options
| author | Jack Nagel | 2014-04-06 21:50:41 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-04-06 21:52:42 -0500 |
| commit | 28bd999dd769676ffd4af2e548ef1fb664aadfed (patch) | |
| tree | 20a28be8276cf5127378f707fc7285c571e146d8 /Library/Formula/cairo.rb | |
| parent | 7f1c91166150c1b9fca6c37adb41b6e12e3dd6cd (diff) | |
| download | homebrew-28bd999dd769676ffd4af2e548ef1fb664aadfed.tar.bz2 | |
cairo: switch to recommended dep
I'm tired of looking at this issue, and I doubt too many people are
using "without-x" anyway. Sorry!
Fixes #25175.
Diffstat (limited to 'Library/Formula/cairo.rb')
| -rw-r--r-- | Library/Formula/cairo.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Library/Formula/cairo.rb b/Library/Formula/cairo.rb index b5d0c9a6a..e4fafde50 100644 --- a/Library/Formula/cairo.rb +++ b/Library/Formula/cairo.rb @@ -19,7 +19,6 @@ class Cairo < Formula keg_only :provided_pre_mountain_lion option :universal - option 'without-x', 'Build without X11 support' depends_on 'pkg-config' => :build depends_on 'freetype' @@ -27,7 +26,7 @@ class Cairo < Formula depends_on 'libpng' depends_on 'pixman' depends_on 'glib' - depends_on :x11 if build.with? 'x' + depends_on :x11 => :recommended def install ENV.universal_binary if build.universal? @@ -36,12 +35,12 @@ class Cairo < Formula --disable-dependency-tracking --prefix=#{prefix} --enable-gobject=yes + --with-x ] - if build.without? 'x' - args << '--enable-xlib=no' << '--enable-xlib-xrender=no' - else - args << '--with-x' + if build.without? "x11" + args.delete "--with-x" + args << "--enable-xlib=no" << "--enable-xlib-xrender=no" end args << '--enable-xcb=no' if MacOS.version <= :leopard |