From a8700d428beebfbe5ed042dd691a8d02b007b154 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: Mon, 18 Aug 2008 05:08:01 +0000 Subject: [PATCH] * builds/unix/configure.raw: Replace all-in-one Carbon.h by minimum CoreServices.h --- ChangeLog | 6 ++++++ builds/unix/configure.raw | 22 ++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c72ebac5d..c9208d1bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-08-18 suzuki toshiya + + * builds/unix/configure.raw: In checking of Mac OS X features, + all-in-one header file "Carbon.h" is replaced by by the minimum + header file "CoreServices.h", as current src/base/ftmac.c. + 2008-08-18 suzuki toshiya * src/sfnt/ttcmap.c (tt_cmap2_validate): Skip the validation of diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 0d67d3f3e..ba6de3cd7 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -212,7 +212,7 @@ if test x$with_old_mac_fonts = xyes; then AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) -# include +# include # include #else # include @@ -236,7 +236,7 @@ if test x$with_old_mac_fonts = xyes; then AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) -# include +# include # include #else # include @@ -268,7 +268,7 @@ if test x$with_old_mac_fonts = xyes; then AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) -# include +# include # include #else # include @@ -317,7 +317,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsspec != x; then AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) -# include +# include # include #else # include @@ -364,7 +364,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsref != x; then AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) -# include +# include # include #else # include @@ -427,7 +427,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_toolbox != x; then AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) -# include +# include # include #else # include @@ -469,7 +469,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_carbon != x; then AC_LANG_PROGRAM([ #if defined(__GNUC__) && defined(__APPLE_CC__) -# include +# include # include #else # include @@ -520,7 +520,13 @@ elif test x$with_old_mac_fonts = xyes -a x$with_ats != x ; then AC_LINK_IFELSE([ AC_LANG_PROGRAM([ -#include +#if defined(__GNUC__) && defined(__APPLE_CC__) +# include +# include +#else +# include +# include +#endif ], [