[cairo] cairo build problem with freetype2.pc

[Matthieu Herrb]

Hi,

The attached patch is needed to build cairo.pc correctly with Freetype 
2.1.9 (ie when freetype2.pc is present). In this case 
FREETYPE_CONFIG_LIBS and FREETYPE_CONFIG_CFLAGS are not defined, so 
cairo.pc contains incomplete information. (and leads to an incomplete 
pango build).

-- 
Matthieu Herrb
-------------- next part --------------
Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.22
diff -u -r1.22 cairo.pc.in
--- cairo.pc.in	17 Aug 2005 22:57:45 -0000	1.22
+++ cairo.pc.in	2 Jan 2006 21:53:35 -0000
@@ -8,5 +8,5 @@
 Version: @VERSION@
 
 @PKGCONFIG_REQUIRES@: @FREETYPE_REQUIRES@ @XRENDER_REQUIRES@ @PNG_REQUIRES@ @GLITZ_REQUIRES@
-Libs: @FREETYPE_CONFIG_LIBS@ -L${libdir} -lcairo 
-Cflags: @FREETYPE_CONFIG_CFLAGS@ -I${includedir}/cairo
+Libs: @FREETYPE_LIBS@ -L${libdir} -lcairo 
+Cflags: @FREETYPE_CFLAGS@ -I${includedir}/cairo