diff options
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
| -rw-r--r-- | Build/source/texk/xdvipdfmx/Makefile.in | 7 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/aclocal.m4 | 1 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/config.h.in | 6 | ||||
| -rwxr-xr-x | Build/source/texk/xdvipdfmx/configure | 139 | ||||
| -rw-r--r-- | Build/source/texk/xdvipdfmx/src/Makefile.in | 12 |
5 files changed, 10 insertions, 155 deletions
diff --git a/Build/source/texk/xdvipdfmx/Makefile.in b/Build/source/texk/xdvipdfmx/Makefile.in index 0446dd69337..a91e3a8d5ae 100644 --- a/Build/source/texk/xdvipdfmx/Makefile.in +++ b/Build/source/texk/xdvipdfmx/Makefile.in @@ -45,12 +45,10 @@ DIST_COMMON = README $(am__configure_deps) \ ../../build-aux/config.sub ../../build-aux/depcomp \ ../../build-aux/install-sh ../../build-aux/ltmain.sh \ ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO + ../../build-aux/ylwrap AUTHORS COPYING ChangeLog INSTALL ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ @@ -154,8 +152,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@ -FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ @@ -265,7 +261,6 @@ ACLOCAL_AMFLAGS = -I ../../m4 SUBDIRS = . src DISTCLEANFILES = config.force EXTRA_DIST = \ - BUGS \ ChangeLog.TL \ data diff --git a/Build/source/texk/xdvipdfmx/aclocal.m4 b/Build/source/texk/xdvipdfmx/aclocal.m4 index 54ee671593d..43e81d03e19 100644 --- a/Build/source/texk/xdvipdfmx/aclocal.m4 +++ b/Build/source/texk/xdvipdfmx/aclocal.m4 @@ -1011,7 +1011,6 @@ AC_SUBST([am__untar]) m4_include([../../m4/cho-libs.m4]) m4_include([../../m4/kpse-common.m4]) -m4_include([../../m4/kpse-fontconfig-flags.m4]) m4_include([../../m4/kpse-freetype2-flags.m4]) m4_include([../../m4/kpse-kpathsea-flags.m4]) m4_include([../../m4/kpse-libpng-flags.m4]) diff --git a/Build/source/texk/xdvipdfmx/config.h.in b/Build/source/texk/xdvipdfmx/config.h.in index 4d720f971aa..e85a4260331 100644 --- a/Build/source/texk/xdvipdfmx/config.h.in +++ b/Build/source/texk/xdvipdfmx/config.h.in @@ -44,9 +44,6 @@ /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H -/* Define to 1 if you have the `FcInit' function. */ -#undef HAVE_FCINIT - /* Define to 1 if you have the <float.h> header file. */ #undef HAVE_FLOAT_H @@ -71,9 +68,6 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define if you have libfontconfig and its headers. */ -#undef HAVE_LIBFONTCONFIG - /* Define if you have libfreetype and its headers. */ #undef HAVE_LIBFREETYPE diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure index a0e1fd2aef2..180a7e63f6e 100755 --- a/Build/source/texk/xdvipdfmx/configure +++ b/Build/source/texk/xdvipdfmx/configure @@ -619,8 +619,6 @@ build_MacOsX_FALSE build_MacOsX_TRUE build_FALSE build_TRUE -FONTCONFIG_LIBS -FONTCONFIG_INCLUDES FREETYPE2_RULE FREETYPE2_DEPEND FREETYPE2_LIBS @@ -777,8 +775,6 @@ with_zlib_libdir with_system_libpng with_system_freetype2 with_paper -with_fontconfig_includes -with_fontconfig_libdir ' ac_precious_vars='build_alias host_alias @@ -1446,10 +1442,6 @@ Optional Packages: --with-system-freetype2 use installed freetype2 headers and library (requires freetype-config) --with-paper=DIR use paper include/library files from DIR - --with-fontconfig-includes=DIR - fontconfig headers installed in DIR - --with-fontconfig-libdir=DIR - fontconfig library installed in DIR Some influential environment variables: CC C compiler command @@ -15773,6 +15765,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +can_build=yes { $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 : @@ -15804,126 +15797,10 @@ $as_echo "#define HAVE_APPLICATIONSERVICES 1" >>confdefs.h fi - -# Check whether --with-fontconfig-includes was given. -if test "${with_fontconfig_includes+set}" = set; then : - withval=$with_fontconfig_includes; -fi - -# Check whether --with-fontconfig-libdir was given. -if test "${with_fontconfig_libdir+set}" = set; then : - withval=$with_fontconfig_libdir; -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for installed fontconfig headers and library" >&5 -$as_echo_n "checking for installed fontconfig headers and library... " >&6; } -if ${kpse_cv_have_fontconfig+:} false; then : - $as_echo_n "(cached) " >&6 -else - kpse_save_CPPFLAGS=$CPPFLAGS -kpse_save_LIBS=$LIBS -kpse_cv_fontconfig_includes= -kpse_cv_fontconfig_libs='-lfontconfig' -if test "x$with_fontconfig_includes:$with_fontconfig_libdir" != x:; then - if test "x$with_fontconfig_includes" != x; then - kpse_cv_fontconfig_includes="-I$with_fontconfig_includes" - fi - if test "x$with_fontconfig_libdir" != x; then - kpse_cv_fontconfig_libs="-L$with_fontconfig_libdir $kpse_cv_fontconfig_libs" - fi -elif $PKG_CONFIG fontconfig; then - kpse_cv_fontconfig_includes=`$PKG_CONFIG fontconfig --cflags` - kpse_cv_fontconfig_libs=`$PKG_CONFIG fontconfig --libs` -fi -CPPFLAGS="$kpse_cv_fontconfig_includes $CPPFLAGS" -LIBS="$kpse_cv_fontconfig_libs $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <fontconfig/fontconfig.h> -int -main () -{ -FcObjectSet *os; FcInit(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - kpse_cv_have_fontconfig=yes -else - kpse_cv_have_fontconfig=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CPPFLAGS=$kpse_save_CPPFLAGS -LIBS=$kpse_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_fontconfig" >&5 -$as_echo "$kpse_cv_have_fontconfig" >&6; } -if test "x$kpse_cv_have_fontconfig" = xyes; then - FONTCONFIG_INCLUDES=$kpse_cv_fontconfig_includes - FONTCONFIG_LIBS=$kpse_cv_fontconfig_libs - -$as_echo "#define HAVE_LIBFONTCONFIG 1" >>confdefs.h - -fi - - - if test "x$kpse_cv_have_ApplicationServices" = xyes; then - can_build=yes $as_echo "#define XETEX_MAC 1" >>confdefs.h -else - eval CPPFLAGS=\"$FONTCONFIG_INCLUDES \$CPPFLAGS\" -eval LIBS=\"$FONTCONFIG_LIBS \$LIBS\" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fontconfig header files and library" >&5 -$as_echo_n "checking for fontconfig header files and library... " >&6; } -if ${cho_cv_have_fontconfig+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <fontconfig/fontconfig.h> -int -main () -{ -FcObjectSet *os; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - cho_cv_have_fontconfig=yes -else - cho_cv_have_fontconfig=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cho_cv_have_fontconfig" >&5 -$as_echo "$cho_cv_have_fontconfig" >&6; } -if test "x$cho_cv_have_fontconfig" = xyes; then : - for ac_func in FcInit -do : - ac_fn_c_check_func "$LINENO" "FcInit" "ac_cv_func_FcInit" -if test "x$ac_cv_func_FcInit" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_FCINIT 1 -_ACEOF - -$as_echo "#define HAVE_LIBFONTCONFIG 1" >>confdefs.h - -fi -done - -fi - - CPPFLAGS=$kpse_save_CPPFLAGS -LIBS=$kpse_save_LIBS - - can_build=$cho_cv_have_fontconfig fi if test "x$can_build" = xyes; then @@ -15931,14 +15808,12 @@ if test "x$can_build" = xyes; then $as_echo "#define XETEX 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fontconfig library or ApplicationServices framework not found. -This version of xdvipdfmx requires either ApplicationServices (on Mac OS X) -or the fontconfig library (on other platforms) to be available, otherwise it -cannot support XeTeX output using standard system-installed fonts." >&5 -$as_echo "$as_me: WARNING: fontconfig library or ApplicationServices framework not found. -This version of xdvipdfmx requires either ApplicationServices (on Mac OS X) -or the fontconfig library (on other platforms) to be available, otherwise it -cannot support XeTeX output using standard system-installed fonts." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 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." >&5 +$as_echo "$as_me: WARNING: 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." >&2;} if test "x$enable_build" != xno; then as_fn_error $? "exiting" "$LINENO" 5 fi diff --git a/Build/source/texk/xdvipdfmx/src/Makefile.in b/Build/source/texk/xdvipdfmx/src/Makefile.in index 7ed667c8adc..3f7002f0507 100644 --- a/Build/source/texk/xdvipdfmx/src/Makefile.in +++ b/Build/source/texk/xdvipdfmx/src/Makefile.in @@ -35,14 +35,11 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = xdvipdfmx$(EXEEXT) -@build_MacOsX_FALSE@am__append_1 = $(FONTCONFIG_INCLUDES) -@build_MacOsX_FALSE@am__append_2 = $(FONTCONFIG_LIBS) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/cho-libs.m4 \ $(top_srcdir)/../../m4/kpse-common.m4 \ - $(top_srcdir)/../../m4/kpse-fontconfig-flags.m4 \ $(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \ $(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \ $(top_srcdir)/../../m4/kpse-libpng-flags.m4 \ @@ -90,7 +87,6 @@ am_xdvipdfmx_OBJECTS = agl.$(OBJEXT) bmpimage.$(OBJEXT) cff.$(OBJEXT) \ xdvipdfmx_OBJECTS = $(am_xdvipdfmx_OBJECTS) xdvipdfmx_LDADD = $(LDADD) am__DEPENDENCIES_1 = -@build_MacOsX_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp am__depfiles_maybe = depfiles @@ -134,8 +130,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -FONTCONFIG_INCLUDES = @FONTCONFIG_INCLUDES@ -FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ FREETYPE2_LIBS = @FREETYPE2_LIBS@ @@ -241,8 +235,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) \ - $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(am__append_1) +INCLUDES = $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) AM_CPPFLAGS = AM_CFLAGS = $(WARNING_CFLAGS) xdvipdfmx_SOURCES = \ @@ -271,8 +264,7 @@ xdvipdfmx_SOURCES = \ unicode.h vf.h xbb.h xdvipdfmx_DEPENDENCIES = $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(LIBPNG_FREETYPE2) $(KPATHSEA_DEPEND) -LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \ - $(am__append_2) +LDADD = $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) @build_MacOsX_TRUE@AM_LDFLAGS = -framework ApplicationServices all: all-am |