wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Audit conditional deps that can be made declarative

Browse source
This commit is contained in:
Jack Nagel 2013-07-16 20:38:50 -05:00
parent a64343f009
commit 33b55122fe
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Formula/curl.rb
View file

@ -10,14 +10,13 @@ class Curl < Formula
"The libcurl provided by Leopard is too old for CouchDB to use."
option 'with-ssh', 'Build with scp and sftp support'
option 'with-libmetalink', 'Build with Metalink support'
option 'with-ares', 'Build with C-Ares async DNS support'
option 'with-ssl', 'Build with Homebrew OpenSSL instead of the system version'
option 'with-darwinssl', 'Build with Secure Transport for SSL support'
depends_on 'pkg-config' => :build
depends_on 'libmetalink' => :optional
depends_on 'libssh2' if build.with? 'ssh'
depends_on 'libmetalink' if build.with? 'libmetalink'
depends_on 'c-ares' if build.with? 'ares'
depends_on 'openssl' if build.with? 'ssl'

4
Formula/mapserver.rb
View file

@ -21,7 +21,7 @@ class Mapserver < Formula
depends_on 'proj'
depends_on 'gdal'
depends_on 'geos' => :optional
depends_on 'postgresql' if build.include? 'with-postgresql' and not MacOS.version >= :lion
depends_on 'postgresql' => :optional unless MacOS.version >= :lion
depends_on 'fcgi' if build.include? 'with-fastcgi'
depends_on 'cairo' => :optional
@ -38,7 +38,7 @@ class Mapserver < Formula
args << "--with-php=/usr/bin/php-config" if build.include? 'with-php'
args << "--with-cairo" if build.with? 'cairo'
if build.include? 'with-postgresql'
if build.with? 'postgresql'
if MacOS.version >= :lion # Lion ships with PostgreSQL libs
args << "--with-postgis"
else