[poppler] poppler: ChangeLog,1.52,1.53 configure.ac,1.15,1.16

[Kristian Hogsberg]

Update of /cvs/poppler/poppler
In directory gabe:/tmp/cvs-serv25896

Modified Files:
	ChangeLog configure.ac 
Log Message:
2005-04-12  Kristian Høgsberg  <krh at 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.



Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ChangeLog	9 Apr 2005 18:14:39 -0000	1.52
+++ ChangeLog	12 Apr 2005 15:37:39 -0000	1.53
@@ -1,3 +1,13 @@
+2005-04-12  Kristian Høgsberg  <krh at 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 at nit.ca>
 
 	* poppler-qt.h:

Index: configure.ac
===================================================================
RCS file: /cvs/poppler/poppler/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- configure.ac	8 Apr 2005 03:30:33 -0000	1.15
+++ configure.ac	12 Apr 2005 15:37:39 -0000	1.16
@@ -153,9 +153,9 @@
               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