Include the correct headers in the test

git-svn-id: svn://tug.org/texlive/trunk@29165 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 21 insertions, 21 deletions

diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index a82bcde64cf..cf20a045e39 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -46,6 +46,9 @@
 /* Define to 1 if you have the `access' function. */
 #undef HAVE_ACCESS
 
+/* Define to 1 if you have the Mac OS X ApplicationServices framework. */
+#undef HAVE_APPLICATIONSERVICES
+
 /* Define to 1 if you have the <assert.h> header file. */
 #undef HAVE_ASSERT_H
 
@@ -61,9 +64,6 @@
 /* Define to 1 if you have the `bzero' function. */
 #undef HAVE_BZERO
 
-/* Define to 1 if you have the Mac OS X Cocoa framework. */
-#undef HAVE_COCOA
-
 /* Define to 1 if you have the declaration of `strndup', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRNDUP
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index ea3f4401748..99671330817 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -18813,14 +18813,14 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X Cocoa framework" >&5
-$as_echo_n "checking for Mac OS X Cocoa framework... " >&6; }
-if ${kpse_cv_have_Cocoa+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mac OS X ApplicationServices framework" >&5
+$as_echo_n "checking for Mac OS X ApplicationServices framework... " >&6; }
+if ${kpse_cv_have_ApplicationServices+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <Cocoa/Cocoa.h>
+#include <ApplicationServices/ApplicationServices.h>
 int
 main ()
 {
@@ -18830,17 +18830,17 @@ CTFontRef font
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  kpse_cv_have_Cocoa=yes
+  kpse_cv_have_ApplicationServices=yes
 else
-  kpse_cv_have_Cocoa=no
+  kpse_cv_have_ApplicationServices=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_Cocoa" >&5
-$as_echo "$kpse_cv_have_Cocoa" >&6; }
-if test "x$kpse_cv_have_Cocoa" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_ApplicationServices" >&5
+$as_echo "$kpse_cv_have_ApplicationServices" >&6; }
+if test "x$kpse_cv_have_ApplicationServices" = xyes; then :
 
-$as_echo "#define HAVE_COCOA 1" >>confdefs.h
+$as_echo "#define HAVE_APPLICATIONSERVICES 1" >>confdefs.h
 
 fi
 
@@ -19001,10 +19001,10 @@ fi
 
 
 
-if test "x$kpse_cv_have_Cocoa:$kpse_cv_have_fontconfig" = xno:no; then :
+if test "x$kpse_cv_have_ApplicationServices:$kpse_cv_have_fontconfig" = xno:no; then :
   if test "x$enable_xetex" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sorry, neither Cocoa framework nor fontconfig library: disabling xetex" >&5
-$as_echo "$as_me: WARNING: Sorry, neither Cocoa framework nor fontconfig library: disabling xetex" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sorry, neither ApplicationServices framework nor fontconfig library: disabling xetex" >&5
+$as_echo "$as_me: WARNING: Sorry, neither ApplicationServices framework nor fontconfig library: disabling xetex" >&2;}
 if test "x$enable_missing" = xno; then :
   as_fn_error $? "terminating." "$LINENO" 5
 fi
@@ -19013,7 +19013,7 @@ fi
 fi
 
 fi
- if test "x$kpse_cv_have_Cocoa" = xyes; then
+ if test "x$kpse_cv_have_ApplicationServices" = xyes; then
   XETEX_MACOSX_TRUE=
   XETEX_MACOSX_FALSE='#'
 else
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index 682d10f8db0..1bab985a477 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -133,11 +133,11 @@ fi
 AC_SUBST([lua_socketlibs])
 AC_SUBST([ipc_socketlibs])
 
-KPSE_CHECK_FRAMEWORK([Cocoa], [CTFontRef font])
+KPSE_CHECK_FRAMEWORK([ApplicationServices], [CTFontRef font])
 KPSE_FONTCONFIG_FLAGS
-AS_IF([test "x$kpse_cv_have_Cocoa:$kpse_cv_have_fontconfig" = xno:no],
-      [WEB2C_DISABLE([xetex], [neither Cocoa framework nor fontconfig library])])
-AM_CONDITIONAL([XETEX_MACOSX], [test "x$kpse_cv_have_Cocoa" = xyes])
+AS_IF([test "x$kpse_cv_have_ApplicationServices:$kpse_cv_have_fontconfig" = xno:no],
+      [WEB2C_DISABLE([xetex], [neither ApplicationServices framework nor fontconfig library])])
+AM_CONDITIONAL([XETEX_MACOSX], [test "x$kpse_cv_have_ApplicationServices" = xyes])
 
 dnl Generate *TEX and ALEPH conditionals.
 m4_foreach([Kpse_Prog], [kpse_tex_progs],