[cairo-commit] cairo ChangeLog,1.129,1.130 cairo.pc.in,1.9,1.10 configure.in,1.37,1.38

[Carl Worth]

Committed by: cworth

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

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

        * src/cairo.h:
        * src/cairo-features.h.in:
        * src/Makefile.am (libcairo_ps_sources): Add conditionals for
        ps_surface functions, etc.

        * configure.in: Get rid of AC_PATH_XTRA. Instead, find X
        includes/libraries only via pkg-config xrender.
        Switch option from --without-x to --disable-xlib
        Add option --disable-ps

        * cairo.pc.in (Libs): Add -lz only if ps_surface backend is compiled.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** ChangeLog	12 Dec 2003 19:02:07 -0000	1.129
--- ChangeLog	12 Dec 2003 19:44:16 -0000	1.130
***************
*** 1,4 ****
--- 1,16 ----
  2003-12-12  Carl Worth  <cworth at east.isi.edu>
  
+ 	* src/cairo.h: 
+ 	* src/cairo-features.h.in: 
+ 	* src/Makefile.am (libcairo_ps_sources): Add conditionals for
+ 	ps_surface functions, etc.
+ 
+ 	* configure.in: Get rid of AC_PATH_XTRA. Instead, find X
+ 	includes/libraries only via pkg-config xrender.
+ 	Switch option from --without-x to --disable-xlib
+ 	Add option --disable-ps
+ 
+ 	* cairo.pc.in (Libs): Add -lz only if ps_surface backend is compiled.
+ 
  	* src/cairo.h (__external_linkage): Add missing definitions from
  	slim_import.h.

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cairo.pc.in	11 Dec 2003 20:43:58 -0000	1.9
--- cairo.pc.in	12 Dec 2003 19:44:16 -0000	1.10
***************
*** 9,13 ****
  
  Requires: fontconfig libpixman @XRENDER_REQUIRES@
! Libs: -L${libdir} -lcairo -lm -lz @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
  
--- 9,13 ----
  
  Requires: fontconfig libpixman @XRENDER_REQUIRES@
! Libs: -L${libdir} -lcairo -lm @PS_SURFACE_LIBS@ @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
  

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** configure.in	11 Dec 2003 20:43:58 -0000	1.37
--- configure.in	12 Dec 2003 19:44:16 -0000	1.38
***************
*** 37,48 ****
  dnl ===========================================================================
  
! AC_PATH_XTRA
  
! if test "x$have_x" != "xyes"; then
    XLIB_SURFACE_FEATURE=CAIRO_HAS_NO_XLIB_SURFACE
  else
    XLIB_SURFACE_FEATURE=CAIRO_HAS_XLIB_SURFACE
    PKG_CHECK_MODULES(XRENDER, xrender >= 0.6)
    XRENDER_REQUIRES=xrender
  fi
  
--- 37,52 ----
  dnl ===========================================================================
  
! AC_ARG_ENABLE(xlib,
!   AC_HELP_STRING([--disable-xlib], [Disable cairo's Xlib backend]),
!   [use_xlib=$enableval], [use_xlib=yes])
  
! if test "x$use_xlib" != "xyes"; then
    XLIB_SURFACE_FEATURE=CAIRO_HAS_NO_XLIB_SURFACE
+   AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, false)
  else
    XLIB_SURFACE_FEATURE=CAIRO_HAS_XLIB_SURFACE
    PKG_CHECK_MODULES(XRENDER, xrender >= 0.6)
    XRENDER_REQUIRES=xrender
+   AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, true)
  fi
  
***************
*** 50,56 ****
  AC_SUBST(XRENDER_REQUIRES)
  
! dnl This is needed for conditional compilation of xlib code in Makefile.am :
! dnl XXX: I'd prefer to have only one test of $have_x, would that be easy?
! AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, test x$have_x = xyes)
  
  dnl ===========================================================================
--- 54,74 ----
  AC_SUBST(XRENDER_REQUIRES)
  
! dnl ===========================================================================
! 
! AC_ARG_ENABLE(ps,
!   AC_HELP_STRING([--disable-ps], [Disable cairo's PostScript backend]),
!   [use_ps=$enableval], [use_ps=yes])
! 
! if test "x$use_ps" != "xyes"; then
!   PS_SURFACE_FEATURE=CAIRO_HAS_NO_PS_SURFACE
!   AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, false)
! else
!   PS_SURFACE_FEATURE=CAIRO_HAS_PS_SURFACE
!   PS_SURFACE_LIBS=-lz
!   AM_CONDITIONAL(CAIRO_HAS_PS_SURFACE, true)
! fi
! 
! AC_SUBST(PS_SURFACE_LIBS)
! AC_SUBST(PS_SURFACE_FEATURE)
  
  dnl ===========================================================================