Do not require cairo to have PDF, EPS, SVG support

Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>

diff --git a/configure.ac b/configure.ac
index 4b7690943df8756b824e29f39e0759db2c5e7109..53e03ce3681b8b99734f593b4fb65208d687fc82 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -543,9 +543,9 @@ dnl EX_CHECK_ALL(png,        png_access_version_number, png.h,
 dnl EX_CHECK_ALL(freetype,   FT_Init_FreeType,          ft2build.h,            freetype2,   2.4.6,  http://download.savannah.gnu.org/releases/freetype/, /usr/include/freetype2)
 dnl EX_CHECK_ALL(fontconfig, FcInit,                    fontconfig.h,          fontconfig,  2.8.0,  http://www.freedesktop.org/software/fontconfig/release/, /usr/include)
 EX_CHECK_ALL(cairo,      cairo_font_options_create,     cairo.h,                cairo-png,   1.10.2,  http://cairographics.org/releases/, "")
-EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,            cairo-svg,   1.10.2,  http://cairographics.org/releases/, "")
-EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,            cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
-EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
+dnl EX_CHECK_ALL(cairo,      cairo_svg_surface_create,      cairo-svg.h,            cairo-svg,   1.10.2,  http://cairographics.org/releases/, "")
+dnl EX_CHECK_ALL(cairo,      cairo_pdf_surface_create,      cairo-pdf.h,            cairo-pdf,   1.10.2,  http://cairographics.org/releases/, "")
+dnl EX_CHECK_ALL(cairo,      cairo_ps_surface_create,       cairo-ps.h,             cairo-ps,    1.10.2,  http://cairographics.org/releases/, "")
 EX_CHECK_ALL(pangocairo-1.0,  pango_font_map_create_context,  pango/pango.h,  pangocairo,  1.28.4,    http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "")
 
 fi

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 13fcc86f87c4b3abb29c3ce563a3fd50144c5cc3..1809106006a701603a2126379cd5bf6ba77024fd 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -257,9 +257,15 @@ enum gfx_if_en if_conv(
 {
 
     conv_if(PNG, IF_PNG);
+#ifdef CAIRO_HAS_SVG_SURFACE
     conv_if(SVG, IF_SVG);
+#endif
+#ifdef CAIRO_HAS_PS_SURFACE
     conv_if(EPS, IF_EPS);
+#endif
+#ifdef CAIRO_HAS_PDF_SURFACE
     conv_if(PDF, IF_PDF);
+#endif
     conv_if(XML, IF_XML);
     conv_if(XMLENUM, IF_XMLENUM);
     conv_if(CSV, IF_CSV);
@@ -3901,6 +3907,7 @@ int graph_cairo_setup (image_desc_t *im)
                                        im->ximg * im->zoom,
                                        im->yimg * im->zoom);
         break;
+#ifdef CAIRO_HAS_PDF_SURFACE
     case IF_PDF:
         im->gridfit = 0;
         im->surface = strlen(im->graphfile)
@@ -3909,6 +3916,8 @@ int graph_cairo_setup (image_desc_t *im)
             : cairo_pdf_surface_create_for_stream
             (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom);
         break;
+#endif
+#ifdef CAIRO_HAS_PS_SURFACE
     case IF_EPS:
         im->gridfit = 0;
         im->surface = strlen(im->graphfile)
@@ -3918,6 +3927,8 @@ int graph_cairo_setup (image_desc_t *im)
             : cairo_ps_surface_create_for_stream
             (&cairo_output, im, im->ximg * im->zoom, im->yimg * im->zoom);
         break;
+#endif
+#ifdef CAIRO_HAS_SVG_SURFACE
     case IF_SVG:
         im->gridfit = 0;
         im->surface = strlen(im->graphfile)
@@ -3930,6 +3941,7 @@ int graph_cairo_setup (image_desc_t *im)
         cairo_svg_surface_restrict_to_version
             (im->surface, CAIRO_SVG_VERSION_1_1);
         break;
+#endif
     case IF_XML:
     case IF_XMLENUM:
     case IF_CSV:

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 52f06180b277a1abc0ae7521bcb0e7889e3ca9cc..bb51b5e70d9e869b92c1dd9029db3a0e8fdc8900 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -10,9 +10,15 @@
 #include "rrd_config.h"
 
 #include <cairo.h>
+#ifdef CAIRO_HAS_PDF_SURFACE
 #include <cairo-pdf.h>
+#endif
+#ifdef CAIRO_HAS_SVG_SURFACE
 #include <cairo-svg.h>
+#endif
+#ifdef CAIRO_HAS_PS_SURFACE
 #include <cairo-ps.h>
+#endif
 
 #include <pango/pangocairo.h>