[cairo-commit] cairo ChangeLog, 1.782, 1.783 configure.in, 1.111, 1.112

[Owen Taylor]

Committed by: otaylor

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

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-07-28  Owen Taylor  <otaylor at redhat.com>

        * configure.in: Disable PS surface build if no freetyp


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.782
retrieving revision 1.783
diff -u -d -r1.782 -r1.783
--- ChangeLog	28 Jul 2005 17:15:35 -0000	1.782
+++ ChangeLog	28 Jul 2005 17:24:59 -0000	1.783
@@ -1,5 +1,9 @@
 2005-07-28  Owen Taylor  <otaylor at redhat.com>
 
+	* configure.in: Disable PS surface build if no freetype.
+
+2005-07-28  Owen Taylor  <otaylor at redhat.com>
+
 	* src/cairo-win32-font.c (_draw_glyphs_on_surface): Pass
 	-1 not 1 to RestoreDC to restore to the last SaveDC.
 	(#3905, Stuart Parmenter)

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- configure.in	18 Jul 2005 18:51:42 -0000	1.111
+++ configure.in	28 Jul 2005 17:24:59 -0000	1.112
@@ -151,29 +151,6 @@
 
 dnl ===========================================================================
 
-AC_ARG_ENABLE(ps,
-  [  --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/)"])
-
-AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, test "x$use_ps" = "xyes")
-if test "x$use_ps" = "xyes"; then
-  PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1"
-  PS_LIBS=-lz
-fi
-AC_SUBST(PS_SURFACE_FEATURE)
-
-CAIRO_LIBS="$CAIRO_LIBS $PS_LIBS"
-
-AC_SUBST(PS_LIBS)
-
-dnl ===========================================================================
-
 AC_ARG_ENABLE(png,
   [  --disable-png           Disable cairo's PNG functions],
   [use_png=$enableval], [use_png=yes])
@@ -315,6 +292,34 @@
 
 dnl ===========================================================================
 
+AC_ARG_ENABLE(ps,
+  [  --disable-ps            Disable cairo's PostScript backend],
+  [use_ps=$enableval], [use_ps=yes])
+
+if test x"$use_freetype" != "xyes" ; then
+  AC_MSG_WARN([PS backend requires FreeType, disabling])
+  use_ps=no
+fi
+
+# 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/)"])
+
+AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, test "x$use_ps" = "xyes")
+if test "x$use_ps" = "xyes"; then
+  PS_SURFACE_FEATURE="#define CAIRO_HAS_PS_SURFACE 1"
+  PS_LIBS=-lz
+fi
+AC_SUBST(PS_SURFACE_FEATURE)
+
+CAIRO_LIBS="$CAIRO_LIBS $PS_LIBS"
+
+AC_SUBST(PS_LIBS)
+
+dnl ===========================================================================
+
 AC_ARG_ENABLE(pdf,
   [  --disable-pdf           Disable cairo's PDF backend],
   [use_pdf=$enableval], [use_pdf=yes])