[PATCH 03/11] configure: Remove Carbon.framework check (always present on macOS).

[Brendan Shanks]

From: Brendan Shanks

---
 configure.ac           |  6 +-----
 dlls/win32u/freetype.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index c057b318f2b..505f1d9afa5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -408,7 +408,6 @@ AC_SYS_LARGEFILE()
 AC_CHECK_HEADERS(\
    AL/al.h \
    CL/cl.h \
-	Carbon/Carbon.h \
    CoreAudio/CoreAudio.h \
    DiskArbitration/DiskArbitration.h \
    EGL/egl.h \
@@ -683,6 +682,7 @@ case $host_os in
     LDDLLFLAGS="-fPIC"
     enable_winemac_drv=${enable_winemac_drv:-yes}
     dnl declare needed frameworks
+    AC_SUBST(CARBON_LIBS,"-framework Carbon")
     AC_SUBST(COREFOUNDATION_LIBS,"-framework CoreFoundation")
     AC_SUBST(IOKIT_LIBS,"-framework IOKit -framework CoreFoundation")
     AC_SUBST(APPLICATIONSERVICES_LIBS,"-framework ApplicationServices")
@@ -739,10 +739,6 @@ case $host_os in
         LIBS="$ac_save_LIBS"
     fi

-    if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
-    then
-        AC_SUBST(CARBON_LIBS,"-framework Carbon")
-    fi
     if test "$ac_cv_header_Metal_Metal_h" = "yes"
     then
         AC_SUBST(METAL_LIBS,"-framework Metal")
diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c
index ca235ff66ec..fd402758daa 100644
--- a/dlls/win32u/freetype.c
+++ b/dlls/win32u/freetype.c
@@ -40,7 +40,7 @@
 #include <assert.h>
 #include <unistd.h>

-#ifdef HAVE_CARBON_CARBON_H
+#ifdef __APPLE__
 #define LoadResource __carbon_LoadResource
 #define CheckMenuItem __carbon_CheckMenuItem
 #define CompareString __carbon_CompareString
@@ -93,7 +93,7 @@
 #undef ResizePalette
 #undef SetRectRgn
 #undef ShowWindow
-#endif /* HAVE_CARBON_CARBON_H */
+#endif /* __APPLE__ */

#ifdef HAVE_FT2BUILD_H
 #include <ft2build.h>
@@ -325,7 +325,7 @@ static BOOL freetype_set_bitmap_text_metrics( struct gdi_font *font );
  * cga40woa.fon=cga40850.fon
  */

-#ifdef HAVE_CARBON_CARBON_H
+#ifdef __APPLE__
 static char *find_cache_dir(void)
 {
     FSRef ref;
@@ -525,7 +525,7 @@ static char **expand_mac_font(const char *path)
     return ret.array;
 }

-#endif /* HAVE_CARBON_CARBON_H */
+#endif /* __APPLE__ */

/* 
    This function builds an FT_Fixed from a double. It fails if the absolute
@@ -1377,7 +1377,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon
     /* we always load external fonts from files - otherwise we would get a crash in update_reg_entries */
     assert(unix_name || !(flags & ADDFONT_EXTERNAL_FONT));

-#ifdef HAVE_CARBON_CARBON_H
+#ifdef __APPLE__
     if(unix_name)
     {
         char **mac_list = expand_mac_font(unix_name);
@@ -1396,7 +1396,7 @@ static INT AddFontToList(const WCHAR *dos_name, const char *unix_name, void *fon
                 return 1;
         }
     }
-#endif /* HAVE_CARBON_CARBON_H */
+#endif /* __APPLE__ */

if (!dos_name && unix_name) dos_name = filename = get_dos_file_name( unix_name );

@@ -1691,7 +1691,7 @@ done:
     if (done_set) pFcStrSetDestroy( done_set );
 }

-#elif defined(HAVE_CARBON_CARBON_H)
+#elif defined(__APPLE__)

static void load_mac_font_callback(const void *value, void *context)
 {
@@ -1885,7 +1885,7 @@ static void freetype_load_fonts(void)
 {
 #ifdef SONAME_LIBFONTCONFIG
     load_fontconfig_fonts();
-#elif defined(HAVE_CARBON_CARBON_H)
+#elif defined(__APPLE__)
     load_mac_fonts();
 #elif defined(__ANDROID__)
     ReadFontDir("/system/fonts", TRUE);