[cairo-commit] cairo ChangeLog, 1.1158, 1.1159 configure.in, 1.150, 1.151

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog configure.in 
Log Message:

2005-12-07  Carl Worth  <cworth at cworth.org>

        * configure.in: Add checks for poppler and friends which are
        needed by pdf2png. Set CAIRO_CAN_TEST_PDF_SURFACE as both a
        #define and an automake conditional.

        * test/Makefile.am: Build pdf2png if possible.

        * test/cairo-test.c: (create_pdf_surface),
        (pdf_surface_write_to_png), (cleanup_pdf), (cairo_test_expecting):
        Add support for testing the PDF backend.

        * test/pdf2png.c: (main): New utility program to convert a PDF
        file into a PNG image using poppler (thanks to Kristian Høgsberg).

        * test/.cvsignore: Ignore new stuff generated by PDF backend
        testing.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1158
retrieving revision 1.1159
diff -u -d -r1.1158 -r1.1159
--- ChangeLog	7 Dec 2005 20:19:10 -0000	1.1158
+++ ChangeLog	8 Dec 2005 00:06:11 -0000	1.1159
@@ -1,5 +1,23 @@
 2005-12-07  Carl Worth  <cworth at cworth.org>
 
+	* configure.in: Add checks for poppler and friends which are
+	needed by pdf2png. Set CAIRO_CAN_TEST_PDF_SURFACE as both a
+	#define and an automake conditional.
+	
+	* test/Makefile.am: Build pdf2png if possible.
+	
+	* test/cairo-test.c: (create_pdf_surface),
+	(pdf_surface_write_to_png), (cleanup_pdf), (cairo_test_expecting):
+	Add support for testing the PDF backend.
+	
+	* test/pdf2png.c: (main): New utility program to convert a PDF
+	file into a PNG image using poppler (thanks to Kristian Høgsberg).
+
+	* test/.cvsignore: Ignore new stuff generated by PDF backend
+	testing.
+
+2005-12-07  Carl Worth  <cworth at cworth.org>
+
 	* ROADMAP: Note that self-copy now works with the PS backend.
 
 	* src/cairo-array.c: (_cairo_array_init),

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- configure.in	7 Dec 2005 19:44:28 -0000	1.150
+++ configure.in	8 Dec 2005 00:06:11 -0000	1.151
@@ -408,13 +408,24 @@
   use_pdf=no
 fi
 
+test_pdf=no
 AM_CONDITIONAL(CAIRO_HAS_PDF_SURFACE, test "x$use_pdf" = "xyes")
 if test "x$use_pdf" = "xyes"; then
   PDF_SURFACE_FEATURE="#define CAIRO_HAS_PDF_SURFACE 1"
   PDF_LIBS=-lz
+  PKG_CHECK_MODULES(POPPLER, poppler-glib pango gtk+-2.0, [test_pdf=yes], [test_pdf=no])
+  if test "x$test_pdf" = "xyes"; then
+    AC_DEFINE([CAIRO_CAN_TEST_PDF_SURFACE], 1, [Define to 1 if the PDF backend can be tested (need poppler and other dependencies for pdf2png)])
+  else
+    AC_MSG_WARN([PDF backend will not be tested since poppler is not available])
+  fi
 fi
 AC_SUBST(PDF_SURFACE_FEATURE)
 
+AM_CONDITIONAL(CAIRO_CAN_TEST_PDF_SURFACE, test "x$test_pdf" = "xyes")
+AC_SUBST(POPPLER_CFLAGS)
+AC_SUBST(POPPLER_LIBS)
+
 CAIRO_LIBS="$CAIRO_LIBS $PDF_LIBS"
 
 AC_SUBST(PDF_LIBS)