diff options
| author | Charlie Sharpsteen | 2011-06-20 16:29:11 -0700 |
|---|---|---|
| committer | Adam Vandenberg | 2011-06-20 17:01:17 -0700 |
| commit | 66f24dcc6551bde9382ea4ca198be40f9bcbca0a (patch) | |
| tree | f3a79f0090ec81f6f9fb7b9398824b8f8115a04f | |
| parent | d732c0c6727f10c054229b71f05d594ae512a9b8 (diff) | |
| download | homebrew-66f24dcc6551bde9382ea4ca198be40f9bcbca0a.tar.bz2 | |
Poppler: Actually depend on Glib if requested
When `--with-glib` is passed to the Poppler formula, then glib should be added
to the dependency list.
This patch also changes the way dependencies are specified to `configure` so
that it will fail if something this derpy happens again.
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
| -rw-r--r-- | Library/Formula/poppler.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb index fbcd15712..f29744719 100644 --- a/Library/Formula/poppler.rb +++ b/Library/Formula/poppler.rb @@ -13,7 +13,8 @@ class Poppler < Formula md5 '592a564fb7075a845f75321ed6425424' depends_on 'pkg-config' => :build - depends_on "qt" if ARGV.include? "--with-qt4" + depends_on 'qt' if ARGV.include? "--with-qt4" + depends_on 'glib' if glib? depends_on 'cairo' if glib? # Needs a newer Cairo build than OS X 10.6.7 provides def options @@ -33,8 +34,8 @@ class Poppler < Formula end args = ["--disable-dependency-tracking", "--prefix=#{prefix}"] - args << "--disable-poppler-qt4" unless ARGV.include? "--with-qt4" - args << "--disable-poppler-glib" unless glib? + args << "--enable-poppler-qt4" if ARGV.include? "--with-qt4" + args << "--enable-poppler-glib" if glib? args << "--enable-xpdf-headers" if ARGV.include? "--enable-xpdf-headers" system "./configure", *args |