diff options
author | Carl Worth <cworth@cworth.org> | 2005-01-20 20:41:40 +0000 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2005-01-20 20:41:40 +0000 |
commit | da1b3c147b9151cef55f0e1c567c897d066bf594 (patch) | |
tree | a3a118a0b65a8abf3fbcab4aba3a1e49bf5159c1 /configure.in | |
parent | 0ad3789985161fe0fe9908ce993aa7ac2d95e8c4 (diff) |
Created new public header cairo-atsui.h.
Build fixes for Quartz backend courtesy of Geoff Norton <gnorton@customerdna.com>:
Fix check for atsui font backend.
Add conditional compilation for cairo_atsui_font.c and cairo_ft_font.c.
Add missing include of cairo-quartz.h.
Add include of Carbon/Carbon.h.
Advertise availability of Quartz surface.
Install cairo-quartz.h, and conditionally compile cairo_quartz_surface.c.
Add autofoo checks to detect quartz backend.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 33 |
1 files changed, 30 insertions, 3 deletions
diff --git a/configure.in b/configure.in index fe1ab19c..4dd539ea 100644 --- a/configure.in +++ b/configure.in @@ -67,11 +67,32 @@ else 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 @@ dnl check for the atsui font backend. 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 @@ dnl =========================================================================== 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" |