[cairo-commit] cairo ChangeLog,1.110,1.111 cairo.pc.in,1.5,1.6 configure.in,1.30,1.31

[James Henstridge]

Committed by: james

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

Modified Files:
	ChangeLog cairo.pc.in configure.in 
Log Message:
2003-11-18  James Henstridge  <james at daa.com.au>

    * cairo.pc.in (Cflags): add FREETYPE_CFLAGS/LIBS to Libs/Cflags
    rather than requiring "freetype2", which doesn't exist in anything
    but the most recent version of freetype.

    * configure.in (FREETYPE_LIBS): add freetype cflags/libs
    substitutions.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** ChangeLog	18 Nov 2003 14:18:05 -0000	1.110
--- ChangeLog	18 Nov 2003 15:28:16 -0000	1.111
***************
*** 1,2 ****
--- 1,11 ----
+ 2003-11-18  James Henstridge  <james at daa.com.au>
+ 
+ 	* cairo.pc.in (Cflags): add FREETYPE_CFLAGS/LIBS to Libs/Cflags
+ 	rather than requiring "freetype2", which doesn't exist in anything
+ 	but the most recent version of freetype.
+ 
+ 	* configure.in (FREETYPE_LIBS): add freetype cflags/libs
+ 	substitutions.
+ 
  2003-11-18  Carl Worth  <cworth at east.isi.edu>
  

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

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** configure.in	10 Nov 2003 16:16:34 -0000	1.30
--- configure.in	18 Nov 2003 15:28:16 -0000	1.31
***************
*** 78,84 ****
  AC_MSG_RESULT($FREETYPE_VERSION - OK)
  
! CAIRO_CFLAGS="$CAIRO_CFLAGS `$FREETYPE_CONFIG --cflags`"
! CAIRO_LIBS="$CAIRO_LIBS `$FREETYPE_CONFIG --libs`"
  
  
  AC_SUBST(CAIRO_CFLAGS)
--- 78,89 ----
  AC_MSG_RESULT($FREETYPE_VERSION - OK)
  
! FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
! FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
! AC_SUBST(FREETYPE_CFLAGS)
! AC_SUBST(FREETYPE_LIBS)
! 
  
+ CAIRO_CFLAGS="$CAIRO_CFLAGS $FREETYPE_CFLAGS"
+ CAIRO_LIBS="$CAIRO_LIBS $FREETYPE_LIBS"
  
  AC_SUBST(CAIRO_CFLAGS)