[cairo-commit] cairo ChangeLog,1.116,1.117 configure.in,1.33,1.34

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog configure.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.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** ChangeLog	3 Dec 2003 20:27:44 -0000	1.116
--- ChangeLog	5 Dec 2003 16:53:07 -0000	1.117
***************
*** 1,2 ****
--- 1,16 ----
+ 2003-12-05  Carl Worth  <cworth at east.isi.edu>
+ 
+ 	* 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.
+ 
  2003-12-03  Carl Worth  <cworth at east.isi.edu>
  

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** configure.in	3 Dec 2003 20:27:44 -0000	1.33
--- configure.in	5 Dec 2003 16:53:07 -0000	1.34
***************
*** 4,8 ****
  
  # Package version number, (as distinct from shared library version)
! CAIRO_VERSION=0.1.14
  
  # libtool shared library version
--- 4,8 ----
  
  # Package version number, (as distinct from shared library version)
! CAIRO_VERSION=0.1.15
  
  # libtool shared library version
***************
*** 40,54 ****
  
  if test "x$have_x" != "xyes"; then
!   XLIB_BACKEND_DEFINE=CAIRO_HAS_NO_XLIB_BACKEND
  else
!   XLIB_BACKEND_DEFINE=CAIRO_HAS_XLIB_BACKEND
    PKG_CHECK_MODULES(XRENDER, xrender >= 0.6)
  fi
  
! AC_SUBST(XLIB_BACKEND_DEFINE)
  
  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(HAVE_XLIB_BACKEND, test x$have_x = xyes)
  
  dnl ===========================================================================
--- 40,54 ----
  
  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)
  fi
  
! AC_SUBST(XLIB_SURFACE_FEATURE)
  
  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 ===========================================================================
***************
*** 110,113 ****
  Makefile
  src/Makefile
! src/cairo-config.h
  ])
--- 110,113 ----
  Makefile
  src/Makefile
! src/cairo-features.h
  ])