Fix cairo checks

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47311 15284696-431f-4ddb-bdfa-cd5b030d7da7
USApp-io · Jul 29, 2011 · 63f79ec · 63f79ec
1 parent 341152e
commit 63f79ec
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/configure b/configure
@@ -12812,9 +12812,9 @@ CAIROLIB=
 if test -n "$USE_CAIRO"; then
 
 cairo="cairo"
-pkgs="cairo-ft cairo-fc"
+pkgs="cairo-ft cairo-fc cairo-pdf cairo-ps cairo-svg"
 if test -n "$USE_X11"; then
-	pkgs="$pkgs cairo-xlib-xrender"
+	pkgs="$pkgs cairo-xlib cairo-xlib-xrender"
 fi
 for pkg in $pkgs ; do
     if pkg-config --exists $pkg ; then

diff --git a/configure.in b/configure.in
@@ -1602,9 +1602,9 @@ CAIROLIB=
 if test -n "$USE_CAIRO"; then
 
 cairo="cairo"
-pkgs="cairo-ft cairo-fc"
+pkgs="cairo-ft cairo-fc cairo-pdf cairo-ps cairo-svg"
 if test -n "$USE_X11"; then
-	pkgs="$pkgs cairo-xlib-xrender"
+	pkgs="$pkgs cairo-xlib cairo-xlib-xrender"
 fi
 for pkg in $pkgs ; do
     if pkg-config --exists $pkg ; then

diff --git a/lib/cairodriver/Graph.c b/lib/cairodriver/Graph.c
@@ -14,9 +14,15 @@
 
 #include "cairodriver.h"
 
+#if CAIRO_HAS_PS_SURFACE
 #include <cairo-ps.h>
+#endif
+#if CAIRO_HAS_PDF_SURFACE
 #include <cairo-pdf.h>
+#endif
+#if CAIRO_HAS_SVG_SURFACE
 #include <cairo-svg.h>
+#endif
 #if CAIRO_HAS_XLIB_XRENDER_SURFACE
 #include <cairo-xlib.h>
 #include <cairo-xlib-xrender.h>