summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-02-15 16:33:51 +0000
committerKhaled Hosny <khaledhosny@eglug.org>2013-02-15 16:33:51 +0000
commit7334c50931e9be0b5f4573cf345e957d6e8e356e (patch)
tree84a0a971c6e232e435395bdd36d117d8fb3aaab7 /Build/source
parent75932961bc13ae5c32a3b01f870b68a3ee0339b5 (diff)
No more ApplicationServices
git-svn-id: svn://tug.org/texlive/trunk@29120 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog6
-rw-r--r--Build/source/texk/xdvipdfmx/configure.ac14
-rw-r--r--Build/source/texk/xdvipdfmx/src/Makefile.am4
-rw-r--r--Build/source/texk/xdvipdfmx/src/fontmap.c2
4 files changed, 7 insertions, 19 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog b/Build/source/texk/xdvipdfmx/ChangeLog
index 245d676a5dc..b1b49de5333 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog
+++ b/Build/source/texk/xdvipdfmx/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-15 Khaled Hosny <khaledhosny@eglug.org>
+
+ * src/fontmap.c: Don't include unused ApplicationServices headers
+ * configure.ac src/Makefile.am: Don't check for now unused Apple
+ ApplicationServices.
+
2013-02-12 Khaled Hosny <khaledhosny@eglug.org>
* dpxfile.c, dpxfile.h (dpx_find_dfont_file): Make public.
diff --git a/Build/source/texk/xdvipdfmx/configure.ac b/Build/source/texk/xdvipdfmx/configure.ac
index 90afef12e68..c5e11618762 100644
--- a/Build/source/texk/xdvipdfmx/configure.ac
+++ b/Build/source/texk/xdvipdfmx/configure.ac
@@ -82,25 +82,11 @@ if test "x$enable_texlive_build" != xyes || test ! -d $srcdir/../kpathsea; then
CHO_CHECK_LIBPAPER
fi
-dnl XXX we should do the check under Mac only
can_build=yes
-KPSE_CHECK_FRAMEWORK([ApplicationServices], [ATSFontRef fontRef])
-if test "x$kpse_cv_have_ApplicationServices" = xyes; then
- AC_DEFINE([XETEX_MAC], 1, [Define if part of a TeX Live build for Mac OS X.])
-fi
-
if test "x$can_build" = xyes; then
AC_DEFINE([XETEX], 1, [Define if part of a TeX Live build.])
-else
- AC_MSG_WARN([ApplicationServices framework not found. This version of
-xdvipdfmx requires ApplicationServices (on Mac OS X) to be available, otherwise
-it cannot support XeTeX output using standard system-installed fonts.])
- if test "x$enable_build" != xno; then
- AC_MSG_ERROR([exiting])
- fi
fi
AM_CONDITIONAL([build], [test "x$can_build" = xyes])
-AM_CONDITIONAL([build_MacOsX], [test "x$kpse_cv_have_ApplicationServices" = xyes])
AC_CONFIG_FILES([Makefile src/Makefile])
diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.am b/Build/source/texk/xdvipdfmx/src/Makefile.am
index 1ffc5647e0a..6ff201801fa 100644
--- a/Build/source/texk/xdvipdfmx/src/Makefile.am
+++ b/Build/source/texk/xdvipdfmx/src/Makefile.am
@@ -37,10 +37,6 @@ xdvipdfmx_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(LIBPNG_FREETYPE2) $(K
LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS)
-if build_MacOsX
-AM_LDFLAGS = -framework ApplicationServices
-endif
-
## Rebuild libkpathsea
@KPATHSEA_RULE@
## Rebuild libfreetype
diff --git a/Build/source/texk/xdvipdfmx/src/fontmap.c b/Build/source/texk/xdvipdfmx/src/fontmap.c
index 93c3e565059..87f8996c702 100644
--- a/Build/source/texk/xdvipdfmx/src/fontmap.c
+++ b/Build/source/texk/xdvipdfmx/src/fontmap.c
@@ -40,7 +40,7 @@
#ifdef XETEX
#include "ft2build.h"
#include FT_FREETYPE_H
-#ifdef XETEX_MAC
+#if 0 && defined(XETEX_MAC)
#include <CoreFoundation/CoreFoundation.h>
#include <ApplicationServices/ApplicationServices.h>
#include FT_MAC_H