ref: a8700d428beebfbe5ed042dd691a8d02b007b154
parent: a2637823db921902c95ba09a254e35375cd1664a
author: Suzuki, Toshiya (鈴木俊哉) <[email protected]>
date: Mon Aug 18 01:08:01 EDT 2008
* builds/unix/configure.raw: Replace all-in-one Carbon.h by minimum CoreServices.h
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-08-18 suzuki toshiya <[email protected]>
+ * 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 <[email protected]>
+
* src/sfnt/ttcmap.c (tt_cmap2_validate): Skip the validation of
sub-header when its code_count is 0. Many Japanese Dynalab fonts
include such empty sub-header (code_count == 0, first_code == 0
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -212,7 +212,7 @@
AC_LANG_PROGRAM([
#if defined(__GNUC__) && defined(__APPLE_CC__)
-# include <Carbon/Carbon.h>
+# include <CoreServices/CoreServices.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# include <ConditionalMacros.h>
@@ -236,7 +236,7 @@
AC_LANG_PROGRAM([
#if defined(__GNUC__) && defined(__APPLE_CC__)
-# include <Carbon/Carbon.h>
+# include <CoreServices/CoreServices.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# include <ConditionalMacros.h>
@@ -268,7 +268,7 @@
AC_LANG_PROGRAM([
#if defined(__GNUC__) && defined(__APPLE_CC__)
-# include <Carbon/Carbon.h>
+# include <CoreServices/CoreServices.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# include <ConditionalMacros.h>
@@ -317,7 +317,7 @@
AC_LANG_PROGRAM([
#if defined(__GNUC__) && defined(__APPLE_CC__)
-# include <Carbon/Carbon.h>
+# include <CoreServices/CoreServices.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# include <ConditionalMacros.h>
@@ -364,7 +364,7 @@
AC_LANG_PROGRAM([
#if defined(__GNUC__) && defined(__APPLE_CC__)
-# include <Carbon/Carbon.h>
+# include <CoreServices/CoreServices.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# include <ConditionalMacros.h>
@@ -427,7 +427,7 @@
AC_LANG_PROGRAM([
#if defined(__GNUC__) && defined(__APPLE_CC__)
-# include <Carbon/Carbon.h>
+# include <CoreServices/CoreServices.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# include <ConditionalMacros.h>
@@ -469,7 +469,7 @@
AC_LANG_PROGRAM([
#if defined(__GNUC__) && defined(__APPLE_CC__)
-# include <Carbon/Carbon.h>
+# include <CoreServices/CoreServices.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# include <ConditionalMacros.h>
@@ -520,7 +520,13 @@
AC_LINK_IFELSE([
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
],
[