From 458c34233d48e0e997cfd4443ef8ede580b34d20 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: Wed, 8 Feb 2006 12:58:24 +0000 Subject: [PATCH] fix --with-old-mac-fonts option --- ChangeLog | 5 +++++ builds/unix/configure.ac | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0ca749642..a74a530e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-08 suzuki toshiya + + * 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 * 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