[cairo-commit] cairo cairo.pc.in,1.10,1.11 configure.in,1.41,1.42

[Olivier Andrieu]

Committed by: oandrieu

Update of /cvs/cairo/cairo
In directory pdx:/tmp/cvs-serv14446

Modified Files:
	cairo.pc.in configure.in 
Log Message:
autoconf support for the PNG backend. Bump version to 0.1.19.

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** a/cairo.pc.in	12 Dec 2003 19:44:16 -0000	1.10
--- b/cairo.pc.in	24 Feb 2004 20:27:52 -0000	1.11
***************
*** 8,12 ****
  Version: @VERSION@
  
! Requires: fontconfig libpixman @XRENDER_REQUIRES@
  Libs: -L${libdir} -lcairo -lm @PS_SURFACE_LIBS@ @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
--- 8,12 ----
  Version: @VERSION@
  
! Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@
  Libs: -L${libdir} -lcairo -lm @PS_SURFACE_LIBS@ @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** a/configure.in	18 Feb 2004 02:38:23 -0000	1.41
--- b/configure.in	24 Feb 2004 20:27:52 -0000	1.42
***************
*** 4,8 ****
  
  # Package version number, (as distinct from shared library version)
! CAIRO_VERSION=0.1.18
  
  # libtool shared library version
--- 4,8 ----
  
  # Package version number, (as distinct from shared library version)
! CAIRO_VERSION=0.1.19
  
  # libtool shared library version
***************
*** 93,96 ****
--- 93,116 ----
  dnl ===========================================================================
  
+ AC_ARG_ENABLE(png,
+   AC_HELP_STRING([--enable-png], [Enable cairo's PNG backend]),
+   [use_png=$enableval], [use_png=no])
+ 
+ if test "x$use_png" != "xyes"; then
+   PNG_SURFACE_FEATURE=CAIRO_HAS_NO_PNG_SURFACE
+   AM_CONDITIONAL(CAIRO_HAS_PNG_SURFACE, false)
+ else
+   PNG_SURFACE_FEATURE=CAIRO_HAS_PNG_SURFACE
+   PKG_CHECK_MODULES(PNG, libpng12,
+   [PNG_REQUIRES=libpng12],[
+     PKG_CHECK_MODULES(PNG, libpng10,
+     [PNG_REQUIRES=libpng10])])
+   AM_CONDITIONAL(CAIRO_HAS_PNG_SURFACE, true)
+ fi
+ 
+ AC_SUBST(PNG_SURFACE_FEATURE)
+ 
+ dnl ===========================================================================
+ 
  PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
  PKG_CHECK_MODULES(CAIRO, libpixman >= 0.1.0)