Changeset 667 for trunk

Timestamp:

03/12/08 14:14:51 (8 months ago)

Author:

tom

Message:

Make cairo components conditional on the relevant libaries etc existing.

Location:

trunk

Files:

• SConstruct (modified) (1 diff)
• bindings/python/SConscript (modified) (1 diff)
• bindings/python/mapnik_python.cpp (modified) (5 diffs)
• bindings/python/python_cairo.cpp (modified) (2 diffs)
• src/SConscript (modified) (2 diffs)

trunk/SConstruct

@@ -125 +125 @@
 env.ParseConfig(env['FREETYPE_CONFIG'] + ' --libs --cflags')
    
-env.ParseConfig('pkg-config --libs --cflags cairomm-1.0')
+if env.Execute('pkg-config --exists cairomm-1.0') == 0:
+    env.ParseConfig('pkg-config --libs --cflags cairomm-1.0')
+    env.Append(CXXFLAGS = '-DHAVE_CAIRO');
 
 if env['XMLPARSER'] == 'tinyxml':

trunk/bindings/python/SConscript

@@ -25 +25 @@
 
 Import('env')
-   
-env.ParseConfig('pkg-config --cflags pycairo')
+
+if env.Execute('pkg-config --exists pycairo') == 0:   
+    env.ParseConfig('pkg-config --cflags pycairo')
+    env.Append(CXXFLAGS = '-DHAVE_PYCAIRO');
 
 prefix = env['PYTHON_PREFIX'] + '/' + env['LIBDIR_SCHEMA'] + '/python' + env['PYTHON_VERSION'] + '/site-packages/'

trunk/bindings/python/mapnik_python.cpp

@@ -59 +59 @@
 #include <mapnik/map.hpp>
 #include <mapnik/agg_renderer.hpp>
+#ifdef HAVE_CAIRO
 #include <mapnik/cairo_renderer.hpp>
+#endif
 #include <mapnik/graphics.hpp>
 #include <mapnik/image_util.hpp>
@@ -66 +68 @@
 #include <mapnik/save_map.hpp>
 
+#ifdef HAVE_PYCAIRO
 #include <pycairo.h>
+#endif
 
 void render(const mapnik::Map& map,mapnik::Image32& image, unsigned offset_x = 0, unsigned offset_y = 0)
@@ -79 +83 @@
     ren.apply();
 }
+
+#ifdef HAVE_PYCAIRO
 
 void render3(const mapnik::Map& map,PycairoSurface* surface, unsigned offset_x = 0, unsigned offset_y = 0)
@@ -93 +99 @@
     ren.apply();
 }
+
+#endif
 
 void render_tile_to_file(const mapnik::Map& map, 
@@ -177 +185 @@
     def("render",&render); 
     def("render",&render2);
+#ifdef HAVE_PYCAIRO
     def("render",&render3);
     def("render",&render4);
+#endif
     def("scale_denominator", &scale_denominator);
     

trunk/bindings/python/python_cairo.cpp

@@ -21 +21 @@
  *****************************************************************************/
 //$Id$
+
+#ifdef HAVE_PYCAIRO
 
 #include <boost/python/type_id.hpp>
@@ -47 +49 @@
    boost::python::converter::registry::insert(&extract_surface, boost::python::type_id<PycairoSurface>());
 }
+
+#else
+
+void register_cairo()
+{
+}
+
+#endif

trunk/src/SConscript

@@ -44 +44 @@
     """
     agg_renderer.cpp
-    cairo_renderer.cpp
     datasource_cache.cpp
     envelope.cpp
@@ -80 +79 @@
     )
 
-#source.append("cairo_renderer.cpp")
+if 'cairo' in env['LIBS']:
+    source += Split(
+        """
+        cairo_renderer.cpp
+        """)
 
 if env['XMLPARSER'] == 'tinyxml':