[cairo-commit] cairo ChangeLog,1.100,1.101 cairo.pc.in,1.3,1.4 configure.in,1.25,1.26

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog cairo.pc.in configure.in 
Log Message:
Fix configure.in and cairo.pc.in now that cairo no longer depends on Xft.

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** ChangeLog	4 Nov 2003 03:17:31 -0000	1.100
--- ChangeLog	4 Nov 2003 16:33:45 -0000	1.101
***************
*** 1,2 ****
--- 1,8 ----
+ 2003-11-04  Carl Worth  <cworth at east.isi.edu>
+ 
+ 	* configure.in:
+ 	* cairo.pc.in (Requires): cairo doesn't depend on Xft after the
+ 	recent text work.
+ 
  2003-11-03  Carl Worth  <cworth at isi.edu>
  

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cairo.pc.in	1 Aug 2003 05:41:44 -0000	1.3
--- cairo.pc.in	4 Nov 2003 16:33:45 -0000	1.4
***************
*** 8,12 ****
  Version: @VERSION@
  
! Requires: libic xft slim
  Libs: -L${libdir} -lcairo -lm
  Cflags: -I${includedir}
--- 8,12 ----
  Version: @VERSION@
  
! Requires: libic slim
  Libs: -L${libdir} -lcairo -lm
  Cflags: -I${includedir}

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** configure.in	4 Nov 2003 03:17:31 -0000	1.25
--- configure.in	4 Nov 2003 16:33:45 -0000	1.26
***************
*** 41,45 ****
  dnl ===========================================================================
  
! PKG_CHECK_MODULES(CAIRO, slim >= 0.2.0 libic >= 0.1.3 xft xrender >= 0.6)
  AC_SUBST(CAIRO_CFLAGS)
  AC_SUBST(CAIRO_LIBS)
--- 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)