[cairo-commit] cairo ChangeLog,1.313,1.314 configure.in,1.72,1.73

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv3820

Modified Files:
	ChangeLog configure.in 
Log Message:

        * src/cairo-atsui.h: Created new public header cairo-atsui.h.

        Build fixes for Quartz backend courtesy of
        Geoff Norton <gnorton at customerdna.com>:

        * configure.in: Fix check for atsui font backend.

        * src/Makefile.am: Add conditional compilation for
        cairo_atsui_font.c and cairo_ft_font.c.

        * src/cairo_quartz_surface.c: Add missing include of
        cairo-quartz.h.

        * src/cairo-quartz.h: Add include of Carbon/Carbon.h.

        * src/cairo-features.h.in: Advertise availability of Quartz
        surface.

        * src/Makefile.am: Install cairo-quartz.h, and conditionally
        compile cairo_quartz_surface.c.

        * configure.in: Add autofoo checks to detect quartz
        backend.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- ChangeLog	20 Jan 2005 16:28:54 -0000	1.313
+++ ChangeLog	21 Jan 2005 04:41:40 -0000	1.314
@@ -1,3 +1,29 @@
+2005-01-20  Carl Worth  <cworth at pippin.local>
+
+	* src/cairo-atsui.h: Created new public header cairo-atsui.h.
+
+	Build fixes for Quartz backend courtesy of
+	Geoff Norton <gnorton at customerdna.com>:
+
+	* configure.in: Fix check for atsui font backend.
+
+	* src/Makefile.am: Add conditional compilation for
+	cairo_atsui_font.c and cairo_ft_font.c.
+
+	* src/cairo_quartz_surface.c: Add missing include of
+	cairo-quartz.h.
+
+	* src/cairo-quartz.h: Add include of Carbon/Carbon.h.
+
+	* src/cairo-features.h.in: Advertise availability of Quartz
+	surface.
+	
+	* src/Makefile.am: Install cairo-quartz.h, and conditionally
+	compile cairo_quartz_surface.c.
+
+	* configure.in: Add autofoo checks to detect quartz
+	backend.
+
 2005-01-20  Carl Worth  <cworth at cworth.org>
 
 	* src/cairoint.h: Track various renamings.

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- configure.in	20 Jan 2005 16:28:54 -0000	1.72
+++ configure.in	21 Jan 2005 04:41:40 -0000	1.73
@@ -67,11 +67,32 @@
   AM_CONDITIONAL(CAIRO_HAS_XLIB_SURFACE, true)
 fi
 
+AC_SUBST(XLIB_SURFACE_FEATURE)
+AC_SUBST(XRENDER_REQUIRES)
+
 CAIRO_CFLAGS="$CAIRO_CFLAGS $XRENDER_CFLAGS"
 CAIRO_LIBS="$CAIRO_LIBS $XRENDER_LIBS"
 
-AC_SUBST(XLIB_SURFACE_FEATURE)
-AC_SUBST(XRENDER_REQUIRES)
+AC_ARG_ENABLE(quartz,
+  [  --disable-quartz          Disable cairo's quartz backend],
+  [use_quartz=$enableval], [use_quartz=yes])
+
+if test "x$use_quartz" = "xyes"; then
+  dnl There is no pkgconfig for quartz; lets do a header check
+  AC_CHECK_HEADER(Carbon/Carbon.h, [use_quartz=yes], [use_quartz=no])
+fi
+
+if test "x$use_quartz" != "xyes"; then
+  QUARTZ_SURFACE_FEATURE=CAIRO_HAS_NO_QUARTZ_SURFACE
+  AM_CONDITIONAL(CAIRO_HAS_QUARTZ_SURFACE, false)
+else
+  QUARTZ_SURFACE_FEATURE=CAIRO_HAS_QUARTZ_SURFACE
+  QUARTZ_LIBS="-Xlinker -framework -Xlinker Carbon"
+  AM_CONDITIONAL(CAIRO_HAS_QUARTZ_SURFACE, true)
+fi
+
+AC_SUBST(QUARTZ_SURFACE_FEATURE)
+CAIRO_LIBS="$CAIRO_LIBS $QUARTZ_LIBS"
 
 dnl ===========================================================================
 
@@ -288,7 +309,12 @@
 
 AC_ARG_ENABLE(atsui,
   [  --disable-atsui         Disable cairo's atsui font backend],
-  [use_atsui=$enableval], [use_atsui=no])
+  [use_atsui=$enableval], [use_atsui=yes])
+
+if test "x$use_atsui" = "xyes"; then
+  dnl There is no pkgconfig for atsui; lets do a header check
+  AC_CHECK_HEADER(Carbon/Carbon.h, [use_atsui=yes], [use_atsui=no])
+fi
 
 if test "x$use_atsui" != "xyes"; then
   ATSUI_FONT_FEATURE=CAIRO_HAS_NO_ATSUI_FONT
@@ -334,6 +360,7 @@
 echo ""
 echo "cairo will be compiled with the following surface backends:"
 echo "  Xlib: $use_xlib"
+echo "  Quartz: $use_quartz"
 echo "  XCB: $use_xcb"
 echo "  PostScript: $use_ps"
 echo "  PDF: $use_pdf"