[cairo-commit] cairo/src cairo-features.h.in,NONE,1.1 .cvsignore,1.4,1.5 Makefile.am,1.14,1.15 cairo.h,1.31,1.32 cairo-config.h.in,1.1,NONE

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory pdx:/tmp/cvs-serv16259/src

Modified Files:
	.cvsignore Makefile.am cairo.h 
Added Files:
	cairo-features.h.in 
Removed Files:
	cairo-config.h.in 
Log Message:

        * configure.in: Bump version to 0.1.15 for new
        CAIRO_HAS_XLIB_SURFACE macro.

        * src/cairo.h: Add missing #include <cairo-features.h>

        * Rename cairo-config.h to cairo-features.h.

        * configure.in: Rename XLIB_BACKEND_DEFINE to
        XLIB_SURFACE_FEATURE. Rename AM_CONDITIONAL HAVE_XLIB_BACKEND to
        CAIRO_HAS_XLIB_SURFACE. Rename user-visibile macro
        CAIRO_HAS_XLIB_BACKEND to CAIRO_HAS_XLIB_SURFACE.


--- NEW FILE: cairo-features.h.in ---
(This appears to be a binary file; contents omitted.)

Index: .cvsignore
===================================================================
RCS file: /cvs/cairo/cairo/src/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** .cvsignore	3 Dec 2003 20:27:44 -0000	1.4
--- .cvsignore	5 Dec 2003 16:53:07 -0000	1.5
***************
*** 6,8 ****
  *.lo
  *.loT
! cairo-config.h
--- 6,8 ----
  *.lo
  *.loT
! cairo-features.h

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile.am	3 Dec 2003 20:27:44 -0000	1.14
--- Makefile.am	5 Dec 2003 16:53:07 -0000	1.15
***************
*** 1,6 ****
  lib_LTLIBRARIES = libcairo.la
! include_HEADERS = cairo.h cairo-config.h
  
! if HAVE_XLIB_BACKEND
  libcairo_xlib_sources = cairo_xlib_surface.c
  else
--- 1,6 ----
  lib_LTLIBRARIES = libcairo.la
! include_HEADERS = cairo.h cairo-features.h
  
! if CAIRO_HAS_XLIB_SURFACE
  libcairo_xlib_sources = cairo_xlib_surface.c
  else

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** cairo.h	3 Dec 2003 20:27:44 -0000	1.31
--- cairo.h	5 Dec 2003 16:53:07 -0000	1.32
***************
*** 29,32 ****
--- 29,34 ----
  #define _CAIRO_H_
  
+ #include <cairo-features.h>
+ 
  #include <ic.h>
  #include <stdio.h>
***************
*** 100,104 ****
  		     double	y_pixels_per_inch);
  
! #ifdef CAIRO_HAS_XLIB_BACKEND
  
  #include <X11/extensions/Xrender.h>
--- 102,106 ----
  		     double	y_pixels_per_inch);
  
! #ifdef CAIRO_HAS_XLIB_SURFACE
  
  #include <X11/extensions/Xrender.h>
***************
*** 110,114 ****
  			   Display	*dpy,
  			   Drawable	drawable);
! #endif /* CAIRO_HAS_X_BACKEND */
  
  typedef enum cairo_operator { 
--- 112,116 ----
  			   Display	*dpy,
  			   Drawable	drawable);
! #endif /* CAIRO_HAS_XLIB_SURFACE */
  
  typedef enum cairo_operator { 
***************
*** 621,625 ****
  			 double	y_pixels_per_inch);
  
! #ifdef CAIRO_HAS_XLIB_BACKEND
  
  /* XXX: This is a mess from the user's POV. Should the Visual or the
--- 623,627 ----
  			 double	y_pixels_per_inch);
  
! #ifdef CAIRO_HAS_XLIB_SURFACE
  
  /* XXX: This is a mess from the user's POV. Should the Visual or the
***************
*** 635,639 ****
  			   Colormap		colormap);
  
! #endif /* CAIRO_HAS_XLIB_BACKEND */
  
  /* Matrix functions */
--- 637,641 ----
  			   Colormap		colormap);
  
! #endif /* CAIRO_HAS_XLIB_SURFACE */
  
  /* Matrix functions */

--- cairo-config.h.in DELETED ---