* builds/unix/configure.raw: Replace all-in-one Carbon.h by minimum CoreServices.h
This commit is contained in:
parent
a2637823db
commit
a8700d428b
|
@ -1,3 +1,9 @@
|
||||||
|
2008-08-18 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
|
* 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 <mpsuzuki@hiroshima-u.ac.jp>
|
2008-08-18 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
* src/sfnt/ttcmap.c (tt_cmap2_validate): Skip the validation of
|
* src/sfnt/ttcmap.c (tt_cmap2_validate): Skip the validation of
|
||||||
|
|
|
@ -212,7 +212,7 @@ if test x$with_old_mac_fonts = xyes; then
|
||||||
AC_LANG_PROGRAM([
|
AC_LANG_PROGRAM([
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
||||||
# include <Carbon/Carbon.h>
|
# include <CoreServices/CoreServices.h>
|
||||||
# include <ApplicationServices/ApplicationServices.h>
|
# include <ApplicationServices/ApplicationServices.h>
|
||||||
#else
|
#else
|
||||||
# include <ConditionalMacros.h>
|
# include <ConditionalMacros.h>
|
||||||
|
@ -236,7 +236,7 @@ if test x$with_old_mac_fonts = xyes; then
|
||||||
AC_LANG_PROGRAM([
|
AC_LANG_PROGRAM([
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
||||||
# include <Carbon/Carbon.h>
|
# include <CoreServices/CoreServices.h>
|
||||||
# include <ApplicationServices/ApplicationServices.h>
|
# include <ApplicationServices/ApplicationServices.h>
|
||||||
#else
|
#else
|
||||||
# include <ConditionalMacros.h>
|
# include <ConditionalMacros.h>
|
||||||
|
@ -268,7 +268,7 @@ if test x$with_old_mac_fonts = xyes; then
|
||||||
AC_LANG_PROGRAM([
|
AC_LANG_PROGRAM([
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
||||||
# include <Carbon/Carbon.h>
|
# include <CoreServices/CoreServices.h>
|
||||||
# include <ApplicationServices/ApplicationServices.h>
|
# include <ApplicationServices/ApplicationServices.h>
|
||||||
#else
|
#else
|
||||||
# include <ConditionalMacros.h>
|
# include <ConditionalMacros.h>
|
||||||
|
@ -317,7 +317,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsspec != x; then
|
||||||
AC_LANG_PROGRAM([
|
AC_LANG_PROGRAM([
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
||||||
# include <Carbon/Carbon.h>
|
# include <CoreServices/CoreServices.h>
|
||||||
# include <ApplicationServices/ApplicationServices.h>
|
# include <ApplicationServices/ApplicationServices.h>
|
||||||
#else
|
#else
|
||||||
# include <ConditionalMacros.h>
|
# include <ConditionalMacros.h>
|
||||||
|
@ -364,7 +364,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsref != x; then
|
||||||
AC_LANG_PROGRAM([
|
AC_LANG_PROGRAM([
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
||||||
# include <Carbon/Carbon.h>
|
# include <CoreServices/CoreServices.h>
|
||||||
# include <ApplicationServices/ApplicationServices.h>
|
# include <ApplicationServices/ApplicationServices.h>
|
||||||
#else
|
#else
|
||||||
# include <ConditionalMacros.h>
|
# include <ConditionalMacros.h>
|
||||||
|
@ -427,7 +427,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_toolbox != x; then
|
||||||
AC_LANG_PROGRAM([
|
AC_LANG_PROGRAM([
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
||||||
# include <Carbon/Carbon.h>
|
# include <CoreServices/CoreServices.h>
|
||||||
# include <ApplicationServices/ApplicationServices.h>
|
# include <ApplicationServices/ApplicationServices.h>
|
||||||
#else
|
#else
|
||||||
# include <ConditionalMacros.h>
|
# include <ConditionalMacros.h>
|
||||||
|
@ -469,7 +469,7 @@ elif test x$with_old_mac_fonts = xyes -a x$with_quickdraw_carbon != x; then
|
||||||
AC_LANG_PROGRAM([
|
AC_LANG_PROGRAM([
|
||||||
|
|
||||||
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
||||||
# include <Carbon/Carbon.h>
|
# include <CoreServices/CoreServices.h>
|
||||||
# include <ApplicationServices/ApplicationServices.h>
|
# include <ApplicationServices/ApplicationServices.h>
|
||||||
#else
|
#else
|
||||||
# include <ConditionalMacros.h>
|
# include <ConditionalMacros.h>
|
||||||
|
@ -520,7 +520,13 @@ elif test x$with_old_mac_fonts = xyes -a x$with_ats != x ; then
|
||||||
AC_LINK_IFELSE([
|
AC_LINK_IFELSE([
|
||||||
AC_LANG_PROGRAM([
|
AC_LANG_PROGRAM([
|
||||||
|
|
||||||
#include <Carbon/Carbon.h>
|
#if defined(__GNUC__) && defined(__APPLE_CC__)
|
||||||
|
# include <CoreServices/CoreServices.h>
|
||||||
|
# include <ApplicationServices/ApplicationServices.h>
|
||||||
|
#else
|
||||||
|
# include <ConditionalMacros.h>
|
||||||
|
# include <Files.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
|
|
Loading…
Reference in New Issue