[cairo-commit] rendertest ChangeLog,1.7,1.8 configure.in,1.4,1.5

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/rendertest
In directory gabe:/tmp/cvs-serv25432

Modified Files:
	ChangeLog configure.in 
Log Message:
Added pixman backend

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/rendertest/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog	11 Sep 2004 15:12:58 -0000	1.7
--- ChangeLog	12 Sep 2004 03:05:47 -0000	1.8
***************
*** 1,2 ****
--- 1,10 ----
+ 2004-09-12  David Reveman  <c99drn at cs.umu.se>
+ 
+ 	* src/xcb.c: _glitz_xcb_render_backend -> _xcb_render_backend.
+ 	(_xcb_render_destroy): Free xcb_surface.
+ 
+ 	* src/Makefile.am: 
+ 	* configure.in: Added pixman backend.
+ 
  2004-09-11  David Reveman  <c99drn at cs.umu.se>
  

Index: configure.in
===================================================================
RCS file: /cvs/cairo/rendertest/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.in	11 Sep 2004 15:12:58 -0000	1.4
--- configure.in	12 Sep 2004 03:05:47 -0000	1.5
***************
*** 128,132 ****
  
  if test "x$use_xcb" = "xyes"; then
!   PKG_CHECK_MODULES(XCB, xcb, [use_xcb=yes], [use_xcb=no])
  fi
  
--- 128,132 ----
  
  if test "x$use_xcb" = "xyes"; then
!   PKG_CHECK_MODULES(XCB, xcb >= 0.8, [use_xcb=yes], [use_xcb=no])
  fi
  
***************
*** 142,145 ****
--- 142,165 ----
  dnl ===========================================================================
  
+ AC_ARG_ENABLE(pixman,
+   [  --disable-pixman        Disable pixman backend],
+   [use_pixman=$enableval], [use_pixman=yes])
+ 
+ if test "x$use_pixman" = "xyes"; then
+   PKG_CHECK_MODULES(PIXMAN, libpixman >= 0.1.1 xcb >= 0.8, 
+                     [use_pixman=yes], [use_pixman=no])
+ fi
+ 
+ if test "x$use_pixman" = "xyes"; then
+   AM_CONDITIONAL(RENDER_PIXMAN_BACKEND, true)
+ else
+   AM_CONDITIONAL(RENDER_PIXMAN_BACKEND, false)
+ fi
+ 
+ AC_SUBST(PIXMAN_CFLAGS)
+ AC_SUBST(PIXMAN_LIBS)
+ 
+ dnl ===========================================================================
+ 
  AC_OUTPUT([
  Makefile
***************
*** 154,156 ****
--- 174,177 ----
  echo "  glitz-agl: $use_glitz_agl"
  echo "  xcb:       $use_xcb"
+ echo "  pixman:    $use_pixman"
  echo ""