diff --git a/ChangeLog b/ChangeLog
index e6f25fb1a..8c91fc7de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-19  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	* 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  <mpsuzuki@hiroshima-u.ac.jp>
 
 	* 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