diff options
| author | Jack Nagel | 2013-10-26 20:49:23 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-10-26 20:51:02 -0500 |
| commit | 927b489ada6a90b0ef40e30f28f7e282021abdda (patch) | |
| tree | 04667b0583c75acd6cb634b00f3fe410186e8df0 /Library/Formula | |
| parent | e4d514a8b183fea62a892e8cd9efb689f9336c5e (diff) | |
| download | homebrew-927b489ada6a90b0ef40e30f28f7e282021abdda.tar.bz2 | |
grass: always depend on Homebrew's cairo
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/grass.rb | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Library/Formula/grass.rb b/Library/Formula/grass.rb index a3d1dbf70..f02f8ff01 100644 --- a/Library/Formula/grass.rb +++ b/Library/Formula/grass.rb @@ -23,7 +23,7 @@ class Grass < Formula depends_on 'wxmac' => :recommended # prefer over OS X's version because of 64bit depends_on :postgresql => :optional depends_on :mysql => :optional - depends_on "cairo" if MacOS.version <= :leopard + depends_on "cairo" depends_on :x11 # needs to find at least X11/include/GL/gl.h # Patches that files are not installed outside of the prefix. @@ -81,15 +81,9 @@ class Grass < Formula args << "--enable-64bit" if MacOS.prefer_64_bit? args << "--with-macos-archs=#{MacOS.preferred_arch}" - # Deal with Cairo support - if MacOS.version <= :leopard - cairo = Formula.factory('cairo') - args << "--with-cairo-includes=#{cairo.include}/cairo" - args << "--with-cairo-libs=#{cairo.lib}" - else - args << "--with-cairo-includes=#{MacOS::X11.include} #{MacOS::X11.include}/cairo" - end - + cairo = Formula.factory('cairo') + args << "--with-cairo-includes=#{cairo.include}/cairo" + args << "--with-cairo-libs=#{cairo.lib}" args << "--with-cairo" # Database support |