[cairo-commit] cairo ChangeLog,1.462,1.463 configure.in,1.95,1.96

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog configure.in 
Log Message:

        A few fixes courtesy of Jason Dorje Short <jdorje at users.sf.net>:

        * configure.in: Disable PS backend if zlib is not found.

        * src/cairo-win32-font.c: (_cairo_win32_font_glyph_path): Fix
        mistyped parameter.

        * src/cairo-win32-surface.c: (_cairo_win32_surface_finish): Fix
        missing return value.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -d -r1.462 -r1.463
--- ChangeLog	30 Mar 2005 17:31:49 -0000	1.462
+++ ChangeLog	30 Mar 2005 21:34:51 -0000	1.463
@@ -1,3 +1,15 @@
+2005-03-30  Carl Worth  <cworth at cworth.org>
+
+	A few fixes courtesy of Jason Dorje Short <jdorje at users.sf.net>:
+
+	* configure.in: Disable PS backend if zlib is not found.
+
+	* src/cairo-win32-font.c: (_cairo_win32_font_glyph_path): Fix
+	mistyped parameter.
+	
+	* src/cairo-win32-surface.c: (_cairo_win32_surface_finish): Fix
+	missing return value.
+
 2005-03-30  T Rowley  <tim.rowley at gmail.com>
 
 	* src/cairo-gstate.c (_cairo_gstate_stroke_extents): call

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- configure.in	29 Mar 2005 19:24:10 -0000	1.95
+++ configure.in	30 Mar 2005 21:34:51 -0000	1.96
@@ -172,6 +172,12 @@
   [  --disable-ps            Disable cairo's PostScript backend],
   [use_ps=$enableval], [use_ps=yes])
 
+# The postscript module requires zlib.
+AC_CHECK_LIB(z, compress,
+             [AC_CHECK_HEADER(zlib.h, [],
+	         [use_ps="no (requires zlib "http://www.gzip.org/zlib/)"])],
+	     [use_ps="no (requires zlib "http://www.gzip.org/zlib/)"])
+
 if test "x$use_ps" != "xyes"; then
   PS_SURFACE_FEATURE=CAIRO_HAS_NO_PS_SURFACE
   AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, false)