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>
This commit is contained in:
Charlie Sharpsteen 2011-06-20 16:29:11 -07:00 committed by Adam Vandenberg
parent 593b587eef
commit 6ca244ce0b

View file

@ -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