From 8cfa8bd51ac9017f84eeb7e12e749e25e0ba6891 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Suzuki=2C=20Toshiya=20=28=E9=88=B4=E6=9C=A8=E4=BF=8A?= =?UTF-8?q?=E5=93=89=29?= Date: Fri, 19 May 2006 22:11:50 +0000 Subject: [PATCH] * remove Carbon dependency of Darwin, if configured with no option --- ChangeLog | 5 +++++ builds/unix/configure.raw | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index e6f25fb1a..8c91fc7de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-19 suzuki toshiya + + * build/unix/configure.raw: Add a fallback to disable Carbon + dependency, if configured with no options on Mac OS X. + 2006-05-19 suzuki toshiya * src/base/ftmac.c (open_face_from_buffer): Deallocate stream when diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index f1f217cc3..9d205daed 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -150,6 +150,14 @@ if test x$with_old_mac_fonts = xyes; then [AC_MSG_RESULT([not found]) LDFLAGS="${orig_LDFLAGS}" CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"]) +else + case x$target_os in + xdarwin*) + dnl AC_MSG_WARN([target system is MacOS but configured to build without Carbon]) + CFLAGS="$CFLAGS -DDARWIN_NO_CARBON" + ;; + *) ;; + esac fi