diff --git a/ChangeLog b/ChangeLog
index 0ca749642..a74a530e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08  suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
+
+	* builds/unix/configure.ac: Fix bug for "--with-old-mac-fonts"
+	option on UNIX platform. It has been broken since 2006-01-11.
+
 2006-02-01  Werner Lemberg  <wl@gnu.org>
 
 	* src/otvalid/module.mk: s/otvalid_module_class/otv_module_class/.
diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac
index e0a70fe17..529da51cf 100644
--- a/builds/unix/configure.ac
+++ b/builds/unix/configure.ac
@@ -140,10 +140,17 @@ AC_ARG_WITH([old-mac-fonts],
   AS_HELP_STRING([--with-old-mac-fonts],
                  [allow Mac resource-based fonts to be used]))
 if test x$with_old_mac_fonts = xyes; then
+  orig_LDFLAGS="${LDFLAGS}"
+  AC_MSG_CHECKING([CoreServices & ApplicationServices of Mac OS X])
   LDFLAGS="$LDFLAGS -Xlinker -framework -Xlinker CoreServices \
                     -Xlinker -framework -Xlinker ApplicationServices"
-else
-  CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"
+  AC_TRY_LINK([ ], [ ], [
+    AC_MSG_RESULT([ok])
+  ], [
+    AC_MSG_RESULT([not found])
+    LDFLAGS="${orig_LDFLAGS}"
+    CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"
+  ])
 fi