[cairo-commit] cairo ChangeLog,1.102,1.103 cairo.pc.in,1.4,1.5 configure.in,1.26,1.27

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory pdx:/tmp/cvs-serv4935

Modified Files:
	ChangeLog cairo.pc.in configure.in 
Log Message:
Add explicit fontconfig and freetype2 dependencies that were implicitly
dropped along with Xft.

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** ChangeLog	4 Nov 2003 16:36:03 -0000	1.102
--- ChangeLog	4 Nov 2003 16:58:53 -0000	1.103
***************
*** 1,2 ****
--- 1,8 ----
+ 2003-11-04  Carl Worth  <cworth at east.isi.edu>
+ 
+ 	* configure.in: 
+ 	* cairo.pc.in (Requires): Add explicit fontconfig and freetype2
+ 	dependencies that were implicitly dropped along with Xft.
+ 
  2003-11-04  Carl Worth  <cworth at isi.edu>
  

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** cairo.pc.in	4 Nov 2003 16:33:45 -0000	1.4
--- cairo.pc.in	4 Nov 2003 16:58:53 -0000	1.5
***************
*** 8,12 ****
  Version: @VERSION@
  
! Requires: libic slim
  Libs: -L${libdir} -lcairo -lm
  Cflags: -I${includedir}
--- 8,12 ----
  Version: @VERSION@
  
! Requires: fontconfig freetype2 libic slim
  Libs: -L${libdir} -lcairo -lm
  Cflags: -I${includedir}

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** configure.in	4 Nov 2003 16:33:45 -0000	1.26
--- configure.in	4 Nov 2003 16:58:53 -0000	1.27
***************
*** 41,45 ****
  dnl ===========================================================================
  
! PKG_CHECK_MODULES(CAIRO, slim >= 0.2.0 libic >= 0.1.3 xrender >= 0.6)
  AC_SUBST(CAIRO_CFLAGS)
  AC_SUBST(CAIRO_LIBS)
--- 41,45 ----
  dnl ===========================================================================
  
! PKG_CHECK_MODULES(CAIRO, fontconfig freetype2 slim >= 0.2.0 libic >= 0.1.3 xrender >= 0.6)
  AC_SUBST(CAIRO_CFLAGS)
  AC_SUBST(CAIRO_LIBS)