[cairo-commit] configure.in

[Brian Ewins]

 configure.in |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

New commits:
diff-tree 5f2b5f1f92d74fbc2d8f97fb547e160e370d4c40 (from 1720d0b9508b70ac0c5f2436c3b80a2ab801f138)
Author: Brian Ewins <Brian.Ewins at gmail.com>
Date:   Sun Mar 4 03:01:22 2007 +0000

    [configure.in] --enable-quartz should require atsui and no xlib 
    
    Recent changes have made quartz and atsui interdependent. It is also
    no longer possible to build quartz with xlib enabled due to a redefinition
    of the 'Picture' symbol. This change makes '--enable-atsui' unnecessary
    and refuses to switch on quartz when it cannot be built because xlib
    is enabled.

diff --git a/configure.in b/configure.in
index f2657db..8608f10 100644
--- a/configure.in
+++ b/configure.in
@@ -269,9 +269,13 @@ CAIRO_BACKEND_ENABLE(xcb, XCB, xcb, XCB_
 dnl ===========================================================================
 
 CAIRO_BACKEND_ENABLE(quartz, Quartz, quartz, QUARTZ_SURFACE, no, [
-  dnl There is no pkgconfig for quartz; lets do a header check
-  AC_CHECK_HEADER(Carbon/Carbon.h, , [use_quartz="no (Carbon headers not found)"])
-  quartz_LIBS="-Xlinker -framework -Xlinker Carbon"
+  if test "x$use_xlib" = "xyes"; then
+    use_quartz="no (requires --disable-xlib)";
+  else
+    dnl There is no pkgconfig for quartz; lets do a header check
+    AC_CHECK_HEADER(Carbon/Carbon.h, , [use_quartz="no (Carbon headers not found)"])
+    quartz_LIBS="-Xlinker -framework -Xlinker Carbon"
+  fi
 ])
 
 dnl ===========================================================================
@@ -568,9 +572,9 @@ dnl ====================================
 dnl This check should default to 'auto' once we have code to actually
 dnl check for the atsui font backend.
 
-CAIRO_BACKEND_ENABLE(atsui, ATSUI font, atsui, ATSUI_FONT, no, [
-  dnl There is no pkgconfig for atsui; lets do a header check
-  AC_CHECK_HEADER(Carbon/Carbon.h, , [use_atsui="no (Carbon not found)"])
+CAIRO_BACKEND_ENABLE(atsui, ATSUI font, atsui, ATSUI_FONT, auto, [
+  dnl Quartz requires and is required by atsui.
+  use_atsui=$use_quartz
 ])
 
 dnl ===========================================================================