Commit a8700d428beebfbe5ed042dd691a8d02b007b154
2008-08-18T05:08:01
* builds/unix/configure.raw: Replace all-in-one Carbon.h by minimum CoreServices.h
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
diff --git a/ChangeLog b/ChangeLog
index c72ebac..c9208d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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>
+
* 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
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 0d67d3f..ba6de3c 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 <Carbon/Carbon.h>
+# include <CoreServices/CoreServices.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# include <ConditionalMacros.h>
@@ -236,7 +236,7 @@ if test x$with_old_mac_fonts = xyes; then
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 @@ if test x$with_old_mac_fonts = xyes; then
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 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsspec != x; then
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 @@ elif test x$with_old_mac_fonts = xyes -a x$with_fsref != x; then
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 @@ 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 <Carbon/Carbon.h>
+# include <CoreServices/CoreServices.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# 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([
#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 @@ elif test x$with_old_mac_fonts = xyes -a x$with_ats != x ; then
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
],
[