[cairo-commit] cairo/src Makefile.am,1.16,1.17 cairo-features.h.in,1.1,1.2 cairo.h,1.35,1.36

[Carl Worth]

Committed by: cworth

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

Modified Files:
	Makefile.am cairo-features.h.in cairo.h 
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: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.am	11 Dec 2003 20:43:58 -0000	1.16
--- Makefile.am	12 Dec 2003 19:44:16 -0000	1.17
***************
*** 2,9 ****
  include_HEADERS = cairo.h cairo-features.h
  
  if CAIRO_HAS_XLIB_SURFACE
  libcairo_xlib_sources = cairo_xlib_surface.c
- else
- libcairo_xlib_sources = 
  endif
  
--- 2,11 ----
  include_HEADERS = cairo.h cairo-features.h
  
+ if CAIRO_HAS_PS_SURFACE
+ libcairo_ps_sources = cairo_ps_surface.c
+ endif
+ 
  if CAIRO_HAS_XLIB_SURFACE
  libcairo_xlib_sources = cairo_xlib_surface.c
  endif
  
***************
*** 25,33 ****
  	cairo_pen.c		\
  	cairo_polygon.c		\
- 	cairo_ps_surface.c	\
  	cairo_slope.c		\
  	cairo_spline.c		\
  	cairo_surface.c		\
  	cairo_traps.c		\
  	$(libcairo_xlib_sources)\
  	cairoint.h
--- 27,35 ----
  	cairo_pen.c		\
  	cairo_polygon.c		\
  	cairo_slope.c		\
  	cairo_spline.c		\
  	cairo_surface.c		\
  	cairo_traps.c		\
+ 	$(libcairo_ps_sources)  \
  	$(libcairo_xlib_sources)\
  	cairoint.h

Index: cairo-features.h.in
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo-features.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cairo-features.h.in	5 Dec 2003 16:53:07 -0000	1.1
--- cairo-features.h.in	12 Dec 2003 19:44:16 -0000	1.2
***************
*** 29,32 ****
--- 29,34 ----
  #define _CAIRO_CONFIG_H_
  
+ #define @PS_SURFACE_FEATURE@
+ 
  #define @XLIB_SURFACE_FEATURE@
  

Index: cairo.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** cairo.h	12 Dec 2003 19:02:07 -0000	1.35
--- cairo.h	12 Dec 2003 19:44:16 -0000	1.36
***************
*** 99,102 ****
--- 99,106 ----
  			int		stride);
  
+ #ifdef CAIRO_HAS_PS_SURFACE
+ 
+ #include <stdio.h>
+ 
  extern void __external_linkage
  cairo_set_target_ps (cairo_t	*cr,
***************
*** 107,110 ****
--- 111,116 ----
  		     double	y_pixels_per_inch);
  
+ #endif /* CAIRO_HAS_PS_SURFACE */
+ 
  #ifdef CAIRO_HAS_XLIB_SURFACE
  
***************
*** 619,622 ****
--- 625,630 ----
  				     int			stride);
  
+ #ifdef CAIRO_HAS_PS_SURFACE
+ 
  /* PS-surface functions */
  
***************
*** 628,631 ****
--- 636,641 ----
  			 double	y_pixels_per_inch);
  
+ #endif /* CAIRO_HAS_PS_SURFACE */
+ 
  #ifdef CAIRO_HAS_XLIB_SURFACE