From 7ff38f5ddc7ebb0f128f3715de20e5c4ff65bdc7 Mon Sep 17 00:00:00 2001
From: Charlie Sharpsteen
Date: Thu, 1 Nov 2012 11:49:18 -0700
Subject: gdal: Re-enable Poppler support

Currently, GDAL 1.9.2 can build against Poppler 0.20.5 so Poppler support is
not re-enabled for the `--complete` option.

Reverts cfad309.
---
 Library/Formula/gdal.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/gdal.rb b/Library/Formula/gdal.rb
index fb731b5cd..492b3e727 100644
--- a/Library/Formula/gdal.rb
+++ b/Library/Formula/gdal.rb
@@ -81,6 +81,7 @@ class Gdal < Formula
 
     # Other libraries
     depends_on "xz" # get liblzma compression algorithm library from XZutils
+    depends_on "poppler"
   end
 
   def get_configure_args
@@ -120,11 +121,7 @@ class Gdal < Formula
       # Should be installed separately after GRASS installation using the
       # official GDAL GRASS plugin.
       "--without-grass",
-      "--without-libgrass",
-
-      # Poppler explicitly disabled. GDAL currently can't compile against
-      # Poppler 0.20.0.
-      "--without-poppler"
+      "--without-libgrass"
     ]
 
     # Optional library support for additional formats.
@@ -138,7 +135,8 @@ class Gdal < Formula
         "--with-epsilon=#{HOMEBREW_PREFIX}",
         "--with-odbc=#{HOMEBREW_PREFIX}",
         "--with-xerces=#{HOMEBREW_PREFIX}",
-        "--with-dods-root=#{HOMEBREW_PREFIX}"
+        "--with-dods-root=#{HOMEBREW_PREFIX}",
+        "--with-poppler=#{HOMEBREW_PREFIX}"
       ]
     else
       args.concat [
@@ -152,6 +150,7 @@ class Gdal < Formula
         "--without-xerces",
         "--without-epsilon",
         "--without-libkml",
+        "--without-poppler",
         "--without-podofo",
         "--with-dods-root=no",
 
-- 
cgit v1.2.3