[cairo-commit] cairo ChangeLog,1.115,1.116 configure.in,1.32,1.33

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog configure.in 
Log Message:

        * configure.in: Bumped version to 0.1.14 to indicate dropped
        cairo-xlib.h and new cairo-config.h.

        * New support for "./configure --without-x" to compile without the
        xlib backend. Many thanks to Sasha V. <sasha at aftercode.net>.

        * configure.in: We do three things here: Make the pkg-config check
        for xrender conditional, set XLIB_BACKEND_DEFINE to either
        CAIRO_HAS_XLIB_BACKEND or CAIRO_HAS_NO_XLIB_BACKEND to be
        substituted into cairo-config.h, and set an AM_CONDITIONAL for
        HAVE_XLIB_BACKEND to enable conditional compilation of
        cairo_xlib_surface.c.  Perhaps that could be simplified a tad, but
        it's what we have working now.  Also split up various
        PKG_CHECK_MODULES into separate checks.

        * src/cairo_gstate.c: Remove errant reference to
        cairo_gstate_set_drawable.

        * src/cairo.h: Move xlib-specific calls in from old cairo-xlib.h,
        now guarded in #ifdef CAIRO_HAS_XLIB_BACKEND.

        * src/Makefile.am (libcairo_xlib_sources): Make compilation of
        cairo_xlib_surface.c conditional.
        (INCLUDES, libcairo_la_LIBADD): Add the new variables from
        splitting up the PKG_CHECK_MODULES calls.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -C2 -d -r1.115 -r1.116
*** ChangeLog	3 Dec 2003 15:14:59 -0000	1.115
--- ChangeLog	3 Dec 2003 20:27:44 -0000	1.116
***************
*** 1,4 ****
--- 1,32 ----
  2003-12-03  Carl Worth  <cworth at east.isi.edu>
  
+ 	* configure.in: Bumped version to 0.1.14 to indicate dropped
+ 	cairo-xlib.h and new cairo-config.h.
+ 
+ 	* New support for "./configure --without-x" to compile without the
+ 	xlib backend. Many thanks to Sasha V. <sasha at aftercode.net>.
+ 	
+ 	* configure.in: We do three things here: Make the pkg-config check
+ 	for xrender conditional, set XLIB_BACKEND_DEFINE to either
+ 	CAIRO_HAS_XLIB_BACKEND or CAIRO_HAS_NO_XLIB_BACKEND to be
+ 	substituted into cairo-config.h, and set an AM_CONDITIONAL for
+ 	HAVE_XLIB_BACKEND to enable conditional compilation of
+ 	cairo_xlib_surface.c.  Perhaps that could be simplified a tad, but
+ 	it's what we have working now.  Also split up various
+ 	PKG_CHECK_MODULES into separate checks.
+ 
+ 	* src/cairo_gstate.c: Remove errant reference to
+ 	cairo_gstate_set_drawable.
+ 
+ 	* src/cairo.h: Move xlib-specific calls in from old cairo-xlib.h,
+ 	now guarded in #ifdef CAIRO_HAS_XLIB_BACKEND.
+ 
+ 	* src/Makefile.am (libcairo_xlib_sources): Make compilation of
+ 	cairo_xlib_surface.c conditional.
+ 	(INCLUDES, libcairo_la_LIBADD): Add the new variables from
+ 	splitting up the PKG_CHECK_MODULES calls.
+ 
+ 2003-12-03  Carl Worth  <cworth at east.isi.edu>
+ 
  	* cairo.pc.in (Libs): Add -lz for the compress function used in
  	the PS backend.

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** configure.in	18 Nov 2003 21:21:29 -0000	1.32
--- configure.in	3 Dec 2003 20:27:44 -0000	1.33
***************
*** 4,8 ****
  
  # Package version number, (as distinct from shared library version)
! CAIRO_VERSION=0.1.13
  
  # libtool shared library version
--- 4,8 ----
  
  # Package version number, (as distinct from shared library version)
! CAIRO_VERSION=0.1.14
  
  # libtool shared library version
***************
*** 39,45 ****
  AC_PATH_XTRA
  
  dnl ===========================================================================
  
! PKG_CHECK_MODULES(CAIRO, fontconfig slim >= 0.2.0 libic >= 0.1.3 xrender >= 0.6)
  
  # Test for freetype2 separate from pkg-config since at least up to
--- 39,59 ----
  AC_PATH_XTRA
  
+ 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 ===========================================================================
  
! PKG_CHECK_MODULES(FONTCONFIG, fontconfig)
! PKG_CHECK_MODULES(CAIRO, slim >= 0.2.0 libic >= 0.1.3)
  
  # Test for freetype2 separate from pkg-config since at least up to
***************
*** 96,98 ****
--- 110,113 ----
  Makefile
  src/Makefile
+ src/cairo-config.h
  ])