[cairo-commit] cairo ChangeLog, 1.1160, 1.1161 configure.in, 1.151, 1.152

[Emmanuel Pacaud]

Committed by: emmanuel

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

Modified Files:
	ChangeLog configure.in 
Log Message:
2005-12-08  Emmanuel Pacaud <emmanuel.pacaud at free.fr>

	* configure.in: add optionnal disabled by default SVG backend.
	
	* src/Makefile.am: include SVG backend files.
	* src/cairo-features.h.in: include SVG_SURFACE_FEATURE.
	* src/cairo-output-stream.c: rename dtostr to _cairo_dtostr for use in
	cairo-svg-surface.c.
	* src/cairoint.h: _cairo_dtostr declaration.
	* src/cairo-svg.h: new.
	* src/cairo-svg-surface.c: new.
	
	* test/Makefile.am: build svg-surface and svg-clip.
	* test/svg-surface.c: new.
	* test/svg-surface.h: new.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1160
retrieving revision 1.1161
diff -u -d -r1.1160 -r1.1161
--- ChangeLog	8 Dec 2005 00:16:20 -0000	1.1160
+++ ChangeLog	8 Dec 2005 21:09:26 -0000	1.1161
@@ -1,3 +1,19 @@
+2005-12-08  Emmanuel Pacaud <emmanuel.pacaud at free.fr>
+
+	* configure.in: add optionnal disabled by default SVG backend.
+	
+	* src/Makefile.am: include SVG backend files.
+	* src/cairo-features.h.in: include SVG_SURFACE_FEATURE.
+	* src/cairo-output-stream.c: rename dtostr to _cairo_dtostr for use in
+	cairo-svg-surface.c.
+	* src/cairoint.h: _cairo_dtostr declaration.
+	* src/cairo-svg.h: new.
+	* src/cairo-svg-surface.c: new.
+	
+	* test/Makefile.am: build svg-surface and svg-clip.
+	* test/svg-surface.c: new.
+	* test/svg-surface.h: new.
+
 2005-12-07  Carl Worth  <cworth at cworth.org>
 
 	* ROADMAP: Note that that PDF backend has been incorporated into

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- configure.in	8 Dec 2005 00:06:11 -0000	1.151
+++ configure.in	8 Dec 2005 21:09:26 -0000	1.152
@@ -432,6 +432,37 @@
 
 dnl ===========================================================================
 
+AC_ARG_ENABLE(svg,
+  [  --enable-svg           Enable cairo's SVG backend],
+  [use_svg=$enableval], [use_svg=no])
+
+if test x"$have_ft_load_sfnt_table" != "xyes" ; then
+  AC_MSG_WARN([PDF backend requires FreeType 2.1.4 or newer, disabling])
+  use_svg=no
+fi
+
+if test "x$use_svg" = "xyes" ; then
+	use_svg=no
+	if $PKG_CONFIG --exists libxml-2.0 ; then
+		# Sets XML_CFLAGS, XML_LIBS
+		PKG_CHECK_MODULES(XML, libxml-2.0)
+		use_svg=yes
+	else
+		AC_MSG_WARN([SVG requires libxml2, which is not found in pkg-config search path, disabling])
+	fi
+fi
+
+AM_CONDITIONAL(CAIRO_HAS_SVG_SURFACE, test "x$use_svg" = "xyes")
+if test "x$use_svg" = "xyes"; then
+  SVG_SURFACE_FEATURE="#define CAIRO_HAS_SVG_SURFACE 1"
+fi
+AC_SUBST(SVG_SURFACE_FEATURE)
+
+CAIRO_CFLAGS="$CAIRO_CFLAGS $XML_CFLAGS"
+CAIRO_LIBS="$CAIRO_LIBS $XML_LIBS"
+
+dnl ===========================================================================
+
 dnl This check should default to 'yes' once we have code to actually
 dnl check for the atsui font backend.
 
@@ -537,18 +568,19 @@
 
 echo ""
 echo "cairo will be compiled with the following surface backends:"
-echo "  Xlib: $use_xlib"
-echo "  Quartz: $use_quartz"
-echo "  XCB: $use_xcb"
-echo "  Win32: $use_win32"
+echo "  Xlib:       $use_xlib"
+echo "  Quartz:     $use_quartz"
+echo "  XCB:        $use_xcb"
+echo "  Win32:      $use_win32"
 echo "  PostScript: $use_ps"
-echo "  PDF: $use_pdf"
-echo "  glitz: $use_glitz"
+echo "  PDF:        $use_pdf"
+echo "  SVG:        $use_svg"
+echo "  glitz:      $use_glitz"
 echo ""
 echo "the following font backends:"
-echo "  FreeType: $use_freetype"
-echo "  Win32: $use_win32"
-echo "  ATSUI: $use_atsui"
+echo "  FreeType:   $use_freetype"
+echo "  Win32:      $use_win32"
+echo "  ATSUI:      $use_atsui"
 echo ""
 echo "and the following features:"
 echo "  PNG functions: $use_png"