diff options
| author | Jack Nagel | 2013-01-26 11:57:11 -0600 |
|---|---|---|
| committer | Jack Nagel | 2013-01-26 12:28:37 -0600 |
| commit | 9076baa3e9d6970703049bf1422a4fadfc3f8d32 (patch) | |
| tree | 3d959ca846da93ae4333d34d364d0876563f6008 /Library/Formula/postgresql.rb | |
| parent | 86ee546abfca03e75114a3135380d5f0120289b3 (diff) | |
| download | homebrew-9076baa3e9d6970703049bf1422a4fadfc3f8d32.tar.bz2 | |
postgresql: use new recommended deps support
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
Diffstat (limited to 'Library/Formula/postgresql.rb')
| -rw-r--r-- | Library/Formula/postgresql.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Library/Formula/postgresql.rb b/Library/Formula/postgresql.rb index 9cef12506..ba0761721 100644 --- a/Library/Formula/postgresql.rb +++ b/Library/Formula/postgresql.rb @@ -7,13 +7,12 @@ class Postgresql < Formula depends_on 'readline' depends_on 'libxml2' if MacOS.version == :leopard # Leopard libxml is too old - depends_on 'ossp-uuid' unless build.include? 'without-ossp-uuid' + depends_on 'ossp-uuid' => :recommended conflicts_with 'postgres-xc', :because => 'postgresql and postgres-xc install the same binaries.' option '32-bit' - option 'without-ossp-uuid', 'Build without OSSP uuid' option 'no-python', 'Build without Python support' option 'no-perl', 'Build without Perl support' option 'enable-dtrace', 'Build with DTrace support' @@ -44,12 +43,12 @@ class Postgresql < Formula "--with-libxml", "--with-libxslt"] - args << "--with-ossp-uuid" unless build.include? 'without-ossp-uuid' + args << "--with-ossp-uuid" if build.with? 'ossp-uuid' args << "--with-python" unless build.include? 'no-python' args << "--with-perl" unless build.include? 'no-perl' args << "--enable-dtrace" if build.include? 'enable-dtrace' - unless build.include? 'without-ossp-uuid' + if build.with? 'ossp-uuid' ENV.append 'CFLAGS', `uuid-config --cflags`.strip ENV.append 'LDFLAGS', `uuid-config --ldflags`.strip ENV.append 'LIBS', `uuid-config --libs`.strip |