configure: Remove Carbon.framework check (always present on macOS).

configure

@@ -742,7 +742,6 @@ WINELOADER_DEPENDS
 LIBWINE_LDFLAGS
 LIBWINE_SHAREDLIB
 METAL_LIBS
-CARBON_LIBS
 OPENCL_LIBS
 COREAUDIO_LIBS
 SECURITY_LIBS
@@ -753,6 +752,7 @@ CORESERVICES_LIBS
 APPLICATIONSERVICES_LIBS
 IOKIT_LIBS
 COREFOUNDATION_LIBS
+CARBON_LIBS
 ac_ct_OBJC
 OBJCFLAGS
 OBJC
@@ -7850,12 +7850,6 @@ then :
   printf "%s\n" "#define HAVE_CL_CL_H 1" >>confdefs.h
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "Carbon/Carbon.h" "ac_cv_header_Carbon_Carbon_h" "$ac_includes_default"
-if test "x$ac_cv_header_Carbon_Carbon_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_CARBON_CARBON_H 1" >>confdefs.h
-
-fi
 ac_fn_c_check_header_compile "$LINENO" "CoreAudio/CoreAudio.h" "ac_cv_header_CoreAudio_CoreAudio_h" "$ac_includes_default"
 if test "x$ac_cv_header_CoreAudio_CoreAudio_h" = xyes
 then :
@@ -9802,7 +9796,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
     DLLFLAGS="$DLLFLAGS -fPIC"
     LDDLLFLAGS="-fPIC"
     enable_winemac_drv=${enable_winemac_drv:-yes}
-        COREFOUNDATION_LIBS="-framework CoreFoundation"
+        CARBON_LIBS="-framework Carbon"
+
+    COREFOUNDATION_LIBS="-framework CoreFoundation"
 
     IOKIT_LIBS="-framework IOKit -framework CoreFoundation"
 
@@ -9979,11 +9975,6 @@ fi
         LIBS="$ac_save_LIBS"
     fi
 
-    if test "$ac_cv_header_Carbon_Carbon_h" = "yes"
-    then
-        CARBON_LIBS="-framework Carbon"
-
-    fi
     if test "$ac_cv_header_Metal_Metal_h" = "yes"
     then
         METAL_LIBS="-framework Metal"
@@ -23261,6 +23252,7 @@ CONFIGURE_TARGETS = $CONFIGURE_TARGETS
 OBJC = $OBJC
 OBJCFLAGS = $OBJCFLAGS
 ac_ct_OBJC = $ac_ct_OBJC
+CARBON_LIBS = $CARBON_LIBS
 COREFOUNDATION_LIBS = $COREFOUNDATION_LIBS
 IOKIT_LIBS = $IOKIT_LIBS
 APPLICATIONSERVICES_LIBS = $APPLICATIONSERVICES_LIBS
@@ -23271,7 +23263,6 @@ DISKARBITRATION_LIBS = $DISKARBITRATION_LIBS
 SECURITY_LIBS = $SECURITY_LIBS
 COREAUDIO_LIBS = $COREAUDIO_LIBS
 OPENCL_LIBS = $OPENCL_LIBS
-CARBON_LIBS = $CARBON_LIBS
 METAL_LIBS = $METAL_LIBS
 LIBWINE_SHAREDLIB = $LIBWINE_SHAREDLIB
 LIBWINE_LDFLAGS = $LIBWINE_LDFLAGS

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")

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);

include/config.h.in

@@ -24,9 +24,6 @@
 /* Define to 1 if you have the <capi20.h> header file. */
 #undef HAVE_CAPI20_H
 
-/* Define to 1 if you have the <Carbon/Carbon.h> header file. */
-#undef HAVE_CARBON_CARBON_H
-
 /* Define to 1 if you have the `clock_gettime' function. */
 #undef HAVE_CLOCK_GETTIME