aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Formula
diff options
context:
space:
mode:
authorDane Springmeyer2013-03-13 12:05:53 -0700
committerAdam Vandenberg2013-03-13 12:26:32 -0700
commit0237068eeb559d03834ee80deb4e806429525332 (patch)
tree5ccb0e5a042fdff7932212f2bfb4008a5fbbb476 /Library/Formula
parent592b8b9cebab9c07b8b5e57290b9a79cd4eb828a (diff)
downloadhomebrew-0237068eeb559d03834ee80deb4e806429525332.tar.bz2
mapnik: fix broken compile against cairo/cairomm after #17032
Fixes https://github.com/mapnik/mapnik/issues/1753 Closes #18458. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Diffstat (limited to 'Library/Formula')
-rw-r--r--Library/Formula/mapnik.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/Library/Formula/mapnik.rb b/Library/Formula/mapnik.rb
index 303378767..5d88c72a4 100644
--- a/Library/Formula/mapnik.rb
+++ b/Library/Formula/mapnik.rb
@@ -64,8 +64,9 @@ class Mapnik < Formula
"PROJ_LIBS=#{proj}/lib" ]
if build.with? 'cairo'
- args << "CAIRO_INCLUDES=#{cairo}/include"
- args << "CAIRO_LIBS=#{cairo}/lib"
+ args << "CAIRO=True" # cairo paths will come from pkg-config
+ else
+ args << "CAIRO=False"
end
args << "GEOS_CONFIG=#{Formula.factory('geos').opt_prefix}/bin/geos-config" if build.with? 'geos'
args << "GDAL_CONFIG=#{Formula.factory('gdal').opt_prefix}/bin/gdal-config" if build.with? 'gdal'