[cairo-commit] cairo ChangeLog, 1.1162, 1.1163 configure.in, 1.152, 1.153

[Vladimir Vukicevic]

Committed by: vladimir

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv16497

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-12-12  Vladimir Vukicevic  <vladimir at pobox.com>

	* configure.in: bump glitz req to 0.5.1, test for backends

	* test/cairo-test.c: Add glitz backend (original patches from
	sunmoon1997 at gmail.com), including glx, wgl, and agl support.
	Add CAIRO_TEST_TARGET environment variable for limiting backends
	to test.

	* test/make-html.pl: Takes all *.log files and spits out html
	to stdout that can be used to view all test results at once.
	


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1162
retrieving revision 1.1163
diff -u -d -r1.1162 -r1.1163
--- ChangeLog	8 Dec 2005 21:22:09 -0000	1.1162
+++ ChangeLog	12 Dec 2005 19:56:40 -0000	1.1163
@@ -1,3 +1,15 @@
+2005-12-12  Vladimir Vukicevic  <vladimir at pobox.com>
+
+	* configure.in: bump glitz req to 0.5.1, test for backends
+	
+	* test/cairo-test.c: Add glitz backend (original patches from
+	sunmoon1997 at gmail.com), including glx, wgl, and agl support.
+	Add CAIRO_TEST_TARGET environment variable for limiting backends
+	to test.
+
+	* test/make-html.pl: Takes all *.log files and spits out html
+	to stdout that can be used to view all test results at once.
+	
 2005-12-08  Emmanuel Pacaud <emmanuel.pacaud at free.fr>
 
 	* test/.cvsignore: shhh...

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- configure.in	8 Dec 2005 21:09:26 -0000	1.152
+++ configure.in	12 Dec 2005 19:56:40 -0000	1.153
@@ -235,11 +235,40 @@
   [use_glitz=$enableval], [use_glitz=no])
 
 if test "x$use_glitz" = "xyes"; then
-  PKG_CHECK_MODULES(GLITZ, glitz >= 0.5.0, [
+  PKG_CHECK_MODULES(GLITZ, glitz >= 0.5.1, [
     GLITZ_REQUIRES=glitz
     use_glitz=yes], [use_glitz="no (requires glitz http://freedesktop.org/Software/glitz)"])
 fi
 
+if test "x$use_glitz" = "xyes";then
+  PKG_CHECK_MODULES(GLITZ_AGL, glitz-agl >= 0.5.1,
+   [have_glitz_agl=yes], [have_glitz_agl=no])
+  PKG_CHECK_MODULES(GLITZ_EGL, glitz-egl >= 0.5.1,
+   [have_glitz_egl=yes], [have_glitz_egl=no])
+  PKG_CHECK_MODULES(GLITZ_GLX, glitz-glx >= 0.5.1,
+   [have_glitz_glx=yes], [have_glitz_glx=no])
+  PKG_CHECK_MODULES(GLITZ_WGL, glitz-wgl >= 0.5.1,
+   [have_glitz_wgl=yes], [have_glitz_wgl=no])
+
+  if test "x$have_glitz_agl" = "xyes";then
+    AC_DEFINE(CAIRO_CAN_TEST_GLITZ_AGL_SURFACE, 1, [define if glitz backend can be tested against agl])
+  fi
+  if test "x$have_glitz_egl" = "xyes";then
+    AC_DEFINE(CAIRO_CAN_TEST_GLITZ_EGL_SURFACE, 1, [define if glitz backend can be tested against egl])
+  fi
+  if test "x$have_glitz_glx" = "xyes";then
+    AC_DEFINE(CAIRO_CAN_TEST_GLITZ_GLX_SURFACE, 1, [define if glitz backend can be tested against glx])
+  fi
+  if test "x$have_glitz_wgl" = "xyes";then
+    AC_DEFINE(CAIRO_CAN_TEST_GLITZ_WGL_SURFACE, 1, [define if glitz backend can be tested against wgl])
+  fi
+fi
+
+AM_CONDITIONAL(CAIRO_CAN_TEST_GLITZ_AGL_SURFACE, test "x$have_glitz_agl" = "xyes")
+AM_CONDITIONAL(CAIRO_CAN_TEST_GLITZ_EGL_SURFACE, test "x$have_glitz_egl" = "xyes")
+AM_CONDITIONAL(CAIRO_CAN_TEST_GLITZ_GLX_SURFACE, test "x$have_glitz_glx" = "xyes")
+AM_CONDITIONAL(CAIRO_CAN_TEST_GLITZ_WGL_SURFACE, test "x$have_glitz_wgl" = "xyes")
+
 AM_CONDITIONAL(CAIRO_HAS_GLITZ_SURFACE, test "x$use_glitz" = "xyes")
 if test "x$use_glitz" = "xyes"; then
   GLITZ_SURFACE_FEATURE="#define CAIRO_HAS_GLITZ_SURFACE 1"