[cairo-commit] cairo ChangeLog,1.123,1.124 cairo.pc.in,1.7,1.8 configure.in,1.35,1.36

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog cairo.pc.in configure.in 
Log Message:

        * cairo.pc.in (Requires):
        * configure.in: Add xrender to cairo.pc Renders line if needed.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** ChangeLog	11 Dec 2003 15:03:41 -0000	1.123
--- ChangeLog	11 Dec 2003 17:35:07 -0000	1.124
***************
*** 1,4 ****
--- 1,9 ----
  2003-12-11  Carl Worth  <cworth at east.isi.edu>
  
+ 	* cairo.pc.in (Requires): 
+ 	* configure.in: Add xrender to cairo.pc Renders line if needed.
+ 
+ 2003-12-11  Carl Worth  <cworth at east.isi.edu>
+ 
  	* src/cairo_ps_surface.c (_cairo_ps_surface_copy_page): Fix to use
  	shifts and masks for endianness-correct PS image

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cairo.pc.in	3 Dec 2003 15:14:59 -0000	1.7
--- cairo.pc.in	11 Dec 2003 17:35:07 -0000	1.8
***************
*** 8,12 ****
  Version: @VERSION@
  
! Requires: fontconfig libic slim
  Libs: -L${libdir} -lcairo -lm -lz @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
--- 8,12 ----
  Version: @VERSION@
  
! Requires: fontconfig libic slim @XRENDER_REQUIRES@
  Libs: -L${libdir} -lcairo -lm -lz @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** configure.in	8 Dec 2003 20:31:22 -0000	1.35
--- configure.in	11 Dec 2003 17:35:07 -0000	1.36
***************
*** 44,50 ****
--- 44,52 ----
    XLIB_SURFACE_FEATURE=CAIRO_HAS_XLIB_SURFACE
    PKG_CHECK_MODULES(XRENDER, xrender >= 0.6)
+   XRENDER_REQUIRES=xrender
  fi
  
  AC_SUBST(XLIB_SURFACE_FEATURE)
+ AC_SUBST(XRENDER_REQUIRES)
  
  dnl This is needed for conditional compilation of xlib code in Makefile.am :