[cairo-commit] cairo AUTHORS, 1.4, 1.5 ChangeLog, 1.167, 1.168 cairo.pc.in, 1.11, 1.12 configure.in, 1.45, 1.46

[Carl Worth]

Committed by: cworth

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

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

        * configure.in: Add checks for Xrender.h in xrender.pc is not
        found. Remove AC_HELP_STRING to be compatible with older versions
        of autoconf (thanks to Bill Spitzak <spitzak at d2.com>).

Index: AUTHORS
===================================================================
RCS file: /cvs/cairo/cairo/AUTHORS,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** a/AUTHORS	31 Mar 2004 01:24:29 -0000	1.4
--- b/AUTHORS	31 Mar 2004 02:45:00 -0000	1.5
***************
*** 11,14 ****
--- 11,15 ----
  Christof Petig <christof at petig-baender.de> Build fixes related to freetype
  Jamey Sharp <jamey at minilop.net> Surface/font backend virtualization, XCB backend
+ Bill Spitzak <spitzak at d2.com> Build fix to find Xrender.h without xrender.pc
  Sasha Vasko <sasha at aftercode.net> Build fix to compile without xlib backend
  Carl Worth <cworth at isi.edu> Original library, support for paths, images

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -d -r1.167 -r1.168
*** a/ChangeLog	31 Mar 2004 01:49:30 -0000	1.167
--- b/ChangeLog	31 Mar 2004 02:45:00 -0000	1.168
***************
*** 1,4 ****
--- 1,8 ----
  2004-03-30  Carl Worth  <cworth at isi.edu>
  
+ 	* configure.in: Add checks for Xrender.h in xrender.pc is not
+ 	found. Remove AC_HELP_STRING to be compatible with older versions
+ 	of autoconf (thanks to Bill Spitzak <spitzak at d2.com>).
+ 
  	* src/cairo_xlib_surface.c (_cairo_xlib_surface_set_clip_region):
  	Add question on semantics with empty region. Fix missing return

Index: cairo.pc.in
===================================================================
RCS file: /cvs/cairo/cairo/cairo.pc.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** a/cairo.pc.in	24 Feb 2004 20:27:52 -0000	1.11
--- b/cairo.pc.in	31 Mar 2004 02:45:00 -0000	1.12
***************
*** 9,13 ****
  
  Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@
! Libs: -L${libdir} -lcairo -lm @PS_SURFACE_LIBS@ @FREETYPE_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
  
--- 9,13 ----
  
  Requires: fontconfig libpixman @XRENDER_REQUIRES@ @PNG_REQUIRES@
! Libs: -L${libdir} -lcairo -lm @PS_SURFACE_LIBS@ @FREETYPE_LIBS@ @XRENDER_LIBS@
  Cflags: -I${includedir} @FREETYPE_CFLAGS@
  

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** a/configure.in	20 Mar 2004 17:54:20 -0000	1.45
--- b/configure.in	31 Mar 2004 02:45:00 -0000	1.46
***************
*** 38,42 ****
  
  AC_ARG_ENABLE(xlib,
!   AC_HELP_STRING([--disable-xlib], [Disable cairo's Xlib backend]),
    [use_xlib=$enableval], [use_xlib=yes])
  
--- 38,42 ----
  
  AC_ARG_ENABLE(xlib,
!   [  --disable-xlib          Disable cairo's Xlib backend],
    [use_xlib=$enableval], [use_xlib=yes])
  
***************
*** 46,51 ****
  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
--- 46,56 ----
  else
    XLIB_SURFACE_FEATURE=CAIRO_HAS_XLIB_SURFACE
!   dnl Check for Xrender header files if the Xrender package is not installed:
!   PKG_CHECK_MODULES(XRENDER, xrender >= 0.6,[
!     XRENDER_REQUIRES=xrender],[
!       AC_CHECK_HEADER(X11/extensions/Xrender.h,[
!       AC_PATH_XTRA
!       XRENDER_LIBS="$X_LIBS -lXrender -lXext -lX11 $X_EXTRA_LIBS"],[
! 	AC_MSG_ERROR(Xrender not found perhaps use --disable-xlib?)])])
    AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, true)
  fi
***************
*** 55,63 ****
  AC_SUBST(XRENDER_LIBS)
  AC_SUBST(XRENDER_REQUIRES)
  
  dnl ===========================================================================
  
  AC_ARG_ENABLE(xcb,
!   AC_HELP_STRING([--disable-xcb], [Disable cairo's XCB backend]),
    [use_xcb=$enableval], [use_xcb=no])
  
--- 60,69 ----
  AC_SUBST(XRENDER_LIBS)
  AC_SUBST(XRENDER_REQUIRES)
+ AC_SUBST(XRENDER_LIBS)
  
  dnl ===========================================================================
  
  AC_ARG_ENABLE(xcb,
!   [  --disable-xcb           Disable cairo's XCB backend],
    [use_xcb=$enableval], [use_xcb=no])
  
***************
*** 78,82 ****
  
  AC_ARG_ENABLE(ps,
!   AC_HELP_STRING([--disable-ps], [Disable cairo's PostScript backend]),
    [use_ps=$enableval], [use_ps=yes])
  
--- 84,88 ----
  
  AC_ARG_ENABLE(ps,
!   [  --disable-ps            Disable cairo's PostScript backend],
    [use_ps=$enableval], [use_ps=yes])
  
***************
*** 96,100 ****
  
  AC_ARG_ENABLE(png,
!   AC_HELP_STRING([--enable-png], [Enable cairo's PNG backend]),
    [use_png=$enableval], [use_png=no])
  
--- 102,106 ----
  
  AC_ARG_ENABLE(png,
!   [  --enable-png            Enable cairo's PNG backend],
    [use_png=$enableval], [use_png=no])