[GRASS-SVN] r35278 - grass/trunk/lib/cairodriver

[svn_grass at osgeo.org]

Author: glynn
Date: 2009-01-07 15:32:28 -0500 (Wed, 07 Jan 2009)
New Revision: 35278

Modified:
   grass/trunk/lib/cairodriver/Makefile
   grass/trunk/lib/cairodriver/cairodriver.h
Log:
Require cairo version 1.6.0 for cairo_xlib_surface_get_xrender_format()
Add X-related compilation and linking switches



Modified: grass/trunk/lib/cairodriver/Makefile
===================================================================
--- grass/trunk/lib/cairodriver/Makefile	2009-01-07 20:31:01 UTC (rev 35277)
+++ grass/trunk/lib/cairodriver/Makefile	2009-01-07 20:32:28 UTC (rev 35278)
@@ -10,7 +10,8 @@
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
 ifneq ($(USE_X11),)
-EXTRA_CFLAGS += -DUSE_X11=1
+EXTRA_LIBS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)
+EXTRA_CFLAGS += $(XCFLAGS) -DUSE_X11=1
 endif
 
 ifneq ($(USE_CAIRO),)

Modified: grass/trunk/lib/cairodriver/cairodriver.h
===================================================================
--- grass/trunk/lib/cairodriver/cairodriver.h	2009-01-07 20:31:01 UTC (rev 35277)
+++ grass/trunk/lib/cairodriver/cairodriver.h	2009-01-07 20:32:28 UTC (rev 35278)
@@ -23,7 +23,8 @@
 
 #include <cairo.h>
 
-#if !defined(USE_X11) || !CAIRO_HAS_XLIB_SURFACE
+#if !defined(USE_X11) || !CAIRO_HAS_XLIB_SURFACE || CAIRO_VERSION < CAIRO_VERSION_ENCODE(1,6,0)
+#undef CAIRO_HAS_XLIB_XRENDER_SURFACE
 #define CAIRO_HAS_XLIB_XRENDER_SURFACE 0
 #endif