Commit 29035304 authored by Kristian Høgsberg's avatar Kristian Høgsberg

2005-04-12 Kristian Høgsberg <krh@redhat.com>

        * configure.ac: Add fontconfig to PKG_CHECK_MODULES for the cairo
        backend too, since we shouldn't depend on cairo.pc to pull that in
        for us.

        * poppler/Makefile.am (INCLUDES): Add $(splash_includes) to
        INCLUDES to make sure the fontconfig include path is added when
        using the splash backend.
parent 0f7dd9a0
2005-04-12 Kristian Høgsberg <krh@redhat.com>
* configure.ac: Add fontconfig to PKG_CHECK_MODULES for the cairo
backend too, since we shouldn't depend on cairo.pc to pull that in
for us.
* poppler/Makefile.am (INCLUDES): Add $(splash_includes) to
INCLUDES to make sure the fontconfig include path is added when
using the splash backend.
2005-04-09 Jeff Muizelaar <jrmuizel@nit.ca>
* poppler-qt.h:
......
......@@ -153,9 +153,9 @@ 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 = 0.4.0)
PKG_CHECK_MODULES(CAIRO, cairo = 0.4.0 fontconfig)
elif test x$enable_cairo_output = xtry; then
PKG_CHECK_MODULES(CAIRO, cairo = 0.4.0,
PKG_CHECK_MODULES(CAIRO, cairo = 0.4.0 fontconfig,
[enable_cairo_output="yes"],
[enable_cairo_output="no"])
fi
......
......@@ -51,6 +51,7 @@ endif
INCLUDES = \
-I$(top_srcdir) \
$(splash_includes) \
$(cairo_includes) \
-DDATADIR=\""$(datadir)"\"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment