* remove Carbon dependency of Darwin, if configured with no option
diff --git a/ChangeLog b/ChangeLog
index e6f25fb..8c91fc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
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
its content cannot be parsed as supported font. This fixes
the second part of Savannah bug #16590.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index f1f217c..9d205da 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -150,6 +150,14 @@
[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