From 66f24dcc6551bde9382ea4ca198be40f9bcbca0a Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Mon, 20 Jun 2011 16:29:11 -0700 Subject: 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 --- Library/Formula/poppler.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Library/Formula') 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 -- cgit v1.2.3