From 1ce6266738cfff86841032d07c3a00adc2523b76 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 30 Jun 2009 22:12:11 +0000
Subject: [PATCH] more robust cairo lib addition - addresses #371

---
 src/SConscript | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/SConscript b/src/SConscript
index 76d48273c..b4178aaef 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -38,9 +38,9 @@ regex = 'boost_regex%s' % env['BOOST_APPEND']
 
 libraries = ['freetype','ltdl','png','tiff','z','jpeg','proj','icuuc',filesystem,regex]
 
-if env['CAIRO']:
-    libraries.append('cairo')
-    libraries.append('cairomm-1.0')
+if '-DHAVE_CAIRO' in env['CXXFLAGS']:
+    # add cairo and cairomm-1.0 to libs
+    libraries.append([lib for lib in env['LIBS'] if lib.startswith('cairo')])
 
 if env['XMLPARSER'] == 'libxml2':
     libraries.append('xml2')