aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/cairo.rb11
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