[cairo-commit] cairo ChangeLog,1.172,1.173 configure.in,1.47,1.48

[David Reveman]

Committed by: davidr

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

Modified Files:
	ChangeLog configure.in 
Log Message:
Automatically detect available backends

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -d -r1.172 -r1.173
*** a/ChangeLog	7 Apr 2004 03:13:11 -0000	1.172
--- b/ChangeLog	9 Apr 2004 21:14:56 -0000	1.173
***************
*** 1,2 ****
--- 1,6 ----
+ 2004-04-09  David Reveman  <c99drn at cs.umu.se>
+ 
+ 	* configure.in: Automatically detect available backends.
+ 
  2004-04-06  Carl Worth  <cworth at isi.edu>
  

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** a/configure.in	6 Apr 2004 16:36:12 -0000	1.47
--- b/configure.in	9 Apr 2004 21:14:56 -0000	1.48
***************
*** 41,44 ****
--- 41,56 ----
    [use_xlib=$enableval], [use_xlib=yes])
  
+ if test "x$use_xlib" = "xyes"; then
+   dnl Check for Xrender header files if the Xrender package is not installed:
+   PKG_CHECK_MODULES(XRENDER, xrender >= 0.6, [
+     XRENDER_REQUIRES=xrender
+     use_xlib=yes], [
+       AC_CHECK_HEADER(X11/extensions/Xrender.h, [
+       AC_PATH_XTRA
+       XRENDER_LIBS="$X_LIBS -lXrender -lXext -lX11 $X_EXTRA_LIBS"
+       use_xlib=yes], [
+ 		use_xlib="no (requires Xrender http://freedesktop.org/software/xlibs)"])])
+ fi
+ 
  if test "x$use_xlib" != "xyes"; then
    XLIB_SURFACE_FEATURE=CAIRO_HAS_NO_XLIB_SURFACE
***************
*** 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
--- 58,61 ----
***************
*** 65,69 ****
  AC_ARG_ENABLE(xcb,
    [  --disable-xcb           Disable cairo's XCB backend],
!   [use_xcb=$enableval], [use_xcb=no])
  
  if test "x$use_xcb" != "xyes"; then
--- 70,79 ----
  AC_ARG_ENABLE(xcb,
    [  --disable-xcb           Disable cairo's XCB backend],
!   [use_xcb=$enableval], [use_xcb=yes])
! 
! if test "x$use_xcb" = "xyes"; then
!   PKG_CHECK_MODULES(XCB, xcb, [use_xcb=yes], [
!   use_xcb="no (requires XCB http://freedesktop.org/software/xcb)"])
! fi
  
  if test "x$use_xcb" != "xyes"; then
***************
*** 72,76 ****
  else
    XCB_SURFACE_FEATURE=CAIRO_HAS_XCB_SURFACE
-   PKG_CHECK_MODULES(XCB, xcb)
    AM_CONDITIONAL(CAIRO_HAS_XCB_SURFACE, true)
  fi
--- 82,85 ----
***************
*** 101,106 ****
  
  AC_ARG_ENABLE(png,
!   [  --enable-png            Enable cairo's PNG backend],
!   [use_png=$enableval], [use_png=no])
  
  if test "x$use_png" != "xyes"; then
--- 110,124 ----
  
  AC_ARG_ENABLE(png,
!   [  --disable-png           Disable cairo's PNG backend],
!   [use_png=$enableval], [use_png=yes])
! 
! if test "x$use_png" = "xyes"; then
!   PKG_CHECK_MODULES(PNG, libpng12, [
!     PNG_REQUIRES=libpng12
!     use_png=yes], [
!       PKG_CHECK_MODULES(PNG, libpng10, [
!       PNG_REQUIRES=libpng10
!       use_png=yes], [use_png="no (requires libpng http://www.libpng.org)"])])
! fi
  
  if test "x$use_png" != "xyes"; then
***************
*** 109,116 ****
  else
    PNG_SURFACE_FEATURE=CAIRO_HAS_PNG_SURFACE
-   PKG_CHECK_MODULES(PNG, libpng12,
-   [PNG_REQUIRES=libpng12],[
-     PKG_CHECK_MODULES(PNG, libpng10,
-     [PNG_REQUIRES=libpng10])])
    AM_CONDITIONAL(CAIRO_HAS_PNG_SURFACE, true)
  fi
--- 127,130 ----
***************
*** 181,182 ****
--- 195,207 ----
  src/cairo-features.h
  ])
+ 
+ dnl ===========================================================================
+ 
+ echo ""
+ echo "cairo will be compiled with the following backends:"
+ echo "  Xlib: $use_xlib"
+ echo "  XCB: $use_xcb"
+ echo "  PostScript: $use_ps"
+ echo "  PNG: $use_png"
+ echo ""
+