From 11ffcc3b5e3fa1fea6483e70a0f0a42e1beefb5e Mon Sep 17 00:00:00 2001 From: Adrian Johnson Date: Wed, 28 Sep 2011 20:35:25 +0930 Subject: [PATCH] autoconf: Check for cairo-ft and other cairo backends so that CAIRO_LIBS includes cairo backend dependencies. --- configure.ac | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 7293d1f..1f15934 100644 --- a/configure.ac +++ b/configure.ac @@ -379,19 +379,27 @@ AC_ARG_ENABLE(cairo-output, enable_cairo_output=$enableval, enable_cairo_output="try") if test x$enable_cairo_output = xyes; then - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION) + PKG_CHECK_MODULES(CAIRO_FREETYPE, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION) elif test x$enable_cairo_output = xtry; then - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION, + PKG_CHECK_MODULES(CAIRO_FREETYPE, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION, [enable_cairo_output="yes"], [enable_cairo_output="no"]) fi -AC_SUBST(CAIRO_CFLAGS) -AC_SUBST(CAIRO_LIBS) AM_CONDITIONAL(BUILD_CAIRO_OUTPUT, test x$enable_cairo_output = xyes) AH_TEMPLATE([HAVE_CAIRO], [Use cairo for rendering.]) if test x$enable_cairo_output = xyes; then + CAIRO_DEPS="cairo cairo-ft" + dnl Check for optional cairo backends + PKG_CHECK_EXISTS(cairo-pdf, [CAIRO_DEPS="$CAIRO_DEPS cairo-pdf"], []) + PKG_CHECK_EXISTS(cairo-ps, [CAIRO_DEPS="$CAIRO_DEPS cairo-ps"], []) + PKG_CHECK_EXISTS(cairo-svg, [CAIRO_DEPS="$CAIRO_DEPS cairo-svg"], []) + + PKG_CHECK_MODULES(CAIRO, $CAIRO_DEPS) + AC_SUBST(CAIRO_CFLAGS) + AC_SUBST(CAIRO_LIBS) + AC_DEFINE(HAVE_CAIRO) CAIRO_FEATURE="#define POPPLER_HAS_CAIRO 1" CAIRO_REQ="cairo" -- 1.7.4.1