[GRASS-SVN] r47311 - in grass/trunk: . lib/cairodriver

[svn_grass at osgeo.org]

Author: glynn
Date: 2011-07-29 12:07:57 -0700 (Fri, 29 Jul 2011)
New Revision: 47311

Modified:
   grass/trunk/configure
   grass/trunk/configure.in
   grass/trunk/lib/cairodriver/Graph.c
Log:
Fix cairo checks


Modified: grass/trunk/configure
===================================================================
--- grass/trunk/configure	2011-07-29 18:02:25 UTC (rev 47310)
+++ grass/trunk/configure	2011-07-29 19:07:57 UTC (rev 47311)
@@ -12812,9 +12812,9 @@
 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

Modified: grass/trunk/configure.in
===================================================================
--- grass/trunk/configure.in	2011-07-29 18:02:25 UTC (rev 47310)
+++ grass/trunk/configure.in	2011-07-29 19:07:57 UTC (rev 47311)
@@ -1602,9 +1602,9 @@
 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

Modified: grass/trunk/lib/cairodriver/Graph.c
===================================================================
--- grass/trunk/lib/cairodriver/Graph.c	2011-07-29 18:02:25 UTC (rev 47310)
+++ grass/trunk/lib/cairodriver/Graph.c	2011-07-29 19:07:57 UTC (rev 47311)
@@ -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>