Require cairo version 1.6.0 for cairo_xlib_surface_get_xrender_format()

Add X-related compilation and linking switches



git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35278 15284696-431f-4ddb-bdfa-cd5b030d7da7

lib/cairodriver/Makefile

@@ -10,7 +10,8 @@ PGM = cairodriver
 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),)

lib/cairodriver/cairodriver.h

@@ -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