diff options
| author | Charlie Sharpsteen | 2012-10-30 14:25:37 -0700 |
|---|---|---|
| committer | Charlie Sharpsteen | 2012-10-30 15:22:03 -0700 |
| commit | b43ad4b41b78b4a0fa7c9eb3c5d28052d57d3297 (patch) | |
| tree | e80ce0e5bc3cf6af58d6c63ca25449bd97114862 /Library/Formula | |
| parent | 6887227ffd8afcf66c4e4072b3028b1657984e30 (diff) | |
| download | homebrew-b43ad4b41b78b4a0fa7c9eb3c5d28052d57d3297.tar.bz2 | |
poppler: Explicitly disable glib unless requested
If the Poppler configure script detects Glib libraries, it will set up for a
build but fail because superenv strips required utilities out of the `PATH`.
Also, fix use of conditional expression operators. `build.include?`
_must always_ have a set of parenthesis surrounding its argument when used in a
conditional expression.
Fixes #15748.
Diffstat (limited to 'Library/Formula')
| -rw-r--r-- | Library/Formula/poppler.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Library/Formula/poppler.rb b/Library/Formula/poppler.rb index 418011f46..9826a7259 100644 --- a/Library/Formula/poppler.rb +++ b/Library/Formula/poppler.rb @@ -28,8 +28,12 @@ class Poppler < Formula args = ["--disable-dependency-tracking", "--prefix=#{prefix}", "--enable-xpdf-headers"] # Explicitly disable Qt if not requested because `POPPLER_QT4_CFLAGS` won't # be set and the build will fail. - args << ( build.include? 'with-qt4' ? '--enable-poppler-qt4' : '--disable-poppler-qt4' ) - args << '--enable-poppler-glib' if build.include? 'with-glib' + # + # Also, explicitly disable Glib as Poppler will find it and set up to + # build, but Superenv will have stripped the Glib utilities out of the + # PATH. + args << ( build.include?('with-qt4') ? '--enable-poppler-qt4' : '--disable-poppler-qt4' ) + args << ( build.include?('with-glib') ? '--enable-poppler-glib' : '--disable-poppler-glib' ) system "./configure", *args system "make install" |