diff options
| -rw-r--r-- | cairo.pc.in | 2 | ||||
| -rw-r--r-- | configure.in | 22 |
2 files changed, 22 insertions, 2 deletions
diff --git a/cairo.pc.in b/cairo.pc.in index 6c66150c6..8383f274b 100644 --- a/cairo.pc.in +++ b/cairo.pc.in @@ -7,7 +7,7 @@ Name: cairo Description: Multi-platform 2D graphics library Version: @VERSION@ -Requires: fontconfig libpixman @XRENDER_REQUIRES@ +Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@ Libs: -L${libdir} -lcairo -lm @PS_SURFACE_LIBS@ @FREETYPE_LIBS@ Cflags: -I${includedir} @FREETYPE_CFLAGS@ diff --git a/configure.in b/configure.in index ea32f985d..adeecf497 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_INIT(src/cairo.h) dnl =========================================================================== # Package version number, (as distinct from shared library version) -CAIRO_VERSION=0.1.18 +CAIRO_VERSION=0.1.19 # libtool shared library version @@ -92,6 +92,26 @@ AC_SUBST(PS_SURFACE_FEATURE) 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) |