From 8ba89cd17a8b4b611e9a3526009c2ea5ee2f2db0 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Sat, 21 Feb 2015 15:05:48 +0000 Subject: Drop FreeType dependency git-svn-id: svn://tug.org/texlive/trunk@36339 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 1 + Build/source/texk/dvipdfm-x/Makefile.am | 8 +- Build/source/texk/dvipdfm-x/Makefile.in | 13 +--- Build/source/texk/dvipdfm-x/configure | 123 ------------------------------- Build/source/texk/dvipdfm-x/configure.ac | 1 - 5 files changed, 8 insertions(+), 138 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index e9d372cb4c8..3a060337cac 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -11,6 +11,7 @@ Makefile.am: new test. * dvi.c (dvi_locate_native_font): correctly load vertical glyph metrics. + * configure.ac, Makefile.am: drop FreeType dependency. 2015-02-21 Akira Kakuto diff --git a/Build/source/texk/dvipdfm-x/Makefile.am b/Build/source/texk/dvipdfm-x/Makefile.am index 5c31ab7d0de..4c062e04bc3 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.am +++ b/Build/source/texk/dvipdfm-x/Makefile.am @@ -16,7 +16,7 @@ endif XDVIPDFMX EXTRA_PROGRAMS = dvipdfmx xdvipdfmx AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(LIBPAPER_INCLUDES) -xdvipdfmx_CPPFLAGS = -DXETEX $(FREETYPE2_INCLUDES) $(AM_CPPFLAGS) +xdvipdfmx_CPPFLAGS = -DXETEX $(AM_CPPFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) dvipdfmx_SOURCES = \ @@ -174,7 +174,7 @@ dvipdfmx_SOURCES = \ nodist_xdvipdfmx_SOURCES = $(dvipdfmx_SOURCES) dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS) -xdvipdfmx_LDADD = $(FREETYPE2_LIBS) $(dvipdfmx_LDADD) +xdvipdfmx_LDADD = $(dvipdfmx_LDADD) $(dvipdfmx_OBJECTS) $(xdvipdfmx_OBJECTS): config.force @@ -251,7 +251,7 @@ endif DVIPDFMX all-local: config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(LIBPAPER_DEPEND) +config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(LIBPAPER_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck @@ -259,8 +259,6 @@ DISTCLEANFILES = config.force ## Rebuild libkpathsea @KPATHSEA_RULE@ -## Rebuild libfreetype -@FREETYPE2_RULE@ ## Rebuild libpng @LIBPNG_RULE@ ## Rebuild libz diff --git a/Build/source/texk/dvipdfm-x/Makefile.in b/Build/source/texk/dvipdfm-x/Makefile.in index d97e655f0de..7730e1ad754 100644 --- a/Build/source/texk/dvipdfm-x/Makefile.in +++ b/Build/source/texk/dvipdfm-x/Makefile.in @@ -215,7 +215,7 @@ nodist_xdvipdfmx_OBJECTS = $(am__objects_1) xdvipdfmx_OBJECTS = $(nodist_xdvipdfmx_OBJECTS) am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -xdvipdfmx_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) +xdvipdfmx_DEPENDENCIES = $(am__DEPENDENCIES_2) am__dist_bin_SCRIPTS_DIST = dvipdft am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -549,10 +549,6 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ -FREETYPE2_DEPEND = @FREETYPE2_DEPEND@ -FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@ -FREETYPE2_LIBS = @FREETYPE2_LIBS@ -FT2_CONFIG = @FT2_CONFIG@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -660,7 +656,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @DVIPDFMX_TRUE@@WIN32_FALSE@dist_bin_SCRIPTS = dvipdft AM_CPPFLAGS = $(KPATHSEA_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) $(LIBPAPER_INCLUDES) -xdvipdfmx_CPPFLAGS = -DXETEX $(FREETYPE2_INCLUDES) $(AM_CPPFLAGS) +xdvipdfmx_CPPFLAGS = -DXETEX $(AM_CPPFLAGS) AM_CFLAGS = $(WARNING_CFLAGS) dvipdfmx_SOURCES = \ agl.c \ @@ -816,7 +812,7 @@ dvipdfmx_SOURCES = \ nodist_xdvipdfmx_SOURCES = $(dvipdfmx_SOURCES) dvipdfmx_LDADD = $(KPATHSEA_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(LIBPAPER_LIBS) -xdvipdfmx_LDADD = $(FREETYPE2_LIBS) $(dvipdfmx_LDADD) +xdvipdfmx_LDADD = $(dvipdfmx_LDADD) bin_links = $(am__append_3) call_dvipdfmx_CPPFLAGS = -DEXEPROG=\"dvipdfmx.exe\" nodist_call_dvipdfmx_SOURCES = callexe.c @@ -2917,12 +2913,11 @@ uninstall-hook: uninstall-bin-links uninstall-man1-links all-local: config.force -config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(FREETYPE2_DEPEND) $(LIBPAPER_DEPEND) +config.force: $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(KPATHSEA_DEPEND) $(LIBPAPER_DEPEND) echo timestamp >config.force $(SHELL) ./config.status --recheck @KPATHSEA_RULE@ -@FREETYPE2_RULE@ @LIBPNG_RULE@ @ZLIB_RULE@ @LIBPAPER_RULE@ diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index f74b763c576..5751ab1866a 100755 --- a/Build/source/texk/dvipdfm-x/configure +++ b/Build/source/texk/dvipdfm-x/configure @@ -647,11 +647,6 @@ LIBPAPER_RULE LIBPAPER_DEPEND LIBPAPER_LIBS LIBPAPER_INCLUDES -FREETYPE2_RULE -FREETYPE2_DEPEND -FREETYPE2_LIBS -FREETYPE2_INCLUDES -FT2_CONFIG LIBPNG_RULE LIBPNG_DEPEND LIBPNG_LIBS @@ -809,7 +804,6 @@ with_system_zlib with_zlib_includes with_zlib_libdir with_system_libpng -with_system_freetype2 with_system_libpaper with_libpaper_includes with_libpaper_libdir @@ -1486,8 +1480,6 @@ Optional Packages: --with-zlib-libdir=DIR zlib library installed in DIR --with-system-libpng use installed libpng headers and library (requires pkg-config) - --with-system-freetype2 use installed freetype2 headers and library - (requires freetype-config) --with-system-libpaper use installed libpaper headers and library --with-libpaper-includes=DIR libpaper headers installed in DIR @@ -15937,121 +15929,6 @@ ${top_builddir}/../../libs/libpng/include/png.h: cd ${top_builddir}/../../libs/libpng && $(MAKE) $(AM_MAKEFLAGS) rebuild' fi -## _KPSE_LIB_FLAGS: Setup freetype2 (-lfreetype) flags - -# Check whether --with-system-freetype2 was given. -if test "${with_system_freetype2+set}" = set; then : - withval=$with_system_freetype2; -fi -if test "x$with_system_freetype2" = xyes; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}freetype-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}freetype-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_FT2_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$FT2_CONFIG"; then - ac_cv_prog_FT2_CONFIG="$FT2_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_FT2_CONFIG="${ac_tool_prefix}freetype-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -FT2_CONFIG=$ac_cv_prog_FT2_CONFIG -if test -n "$FT2_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FT2_CONFIG" >&5 -$as_echo "$FT2_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_FT2_CONFIG"; then - ac_ct_FT2_CONFIG=$FT2_CONFIG - # Extract the first word of "freetype-config", so it can be a program name with args. -set dummy freetype-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_FT2_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_FT2_CONFIG"; then - ac_cv_prog_ac_ct_FT2_CONFIG="$ac_ct_FT2_CONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_FT2_CONFIG="freetype-config" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_FT2_CONFIG=$ac_cv_prog_ac_ct_FT2_CONFIG -if test -n "$ac_ct_FT2_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FT2_CONFIG" >&5 -$as_echo "$ac_ct_FT2_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_FT2_CONFIG" = x; then - FT2_CONFIG="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - FT2_CONFIG=$ac_ct_FT2_CONFIG - fi -else - FT2_CONFIG="$ac_cv_prog_FT2_CONFIG" -fi -if $FT2_CONFIG --ftversion >/dev/null 2>&1; then - FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` - FREETYPE2_LIBS=`$FT2_CONFIG --libs` -elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then - as_fn_error $? "did not find freetype-config required for system freetype2 library" "$LINENO" 5 -fi -else - FREETYPE2_INCLUDES="-I$kpse_BLD/libs/freetype2/freetype2" - FREETYPE2_LIBS="$kpse_BLD/libs/freetype2/libfreetype.a" - FREETYPE2_DEPEND='${top_builddir}/../../libs/freetype2/libfreetype.a' - FREETYPE2_RULE='# Rebuild libfreetype -$(FREETYPE2_DEPEND): ${top_builddir}/../../libs/freetype2/freetype2/ft2build.h - cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild -${top_builddir}/../../libs/freetype2/freetype2/ft2build.h: - cd ${top_builddir}/../../libs/freetype2 && $(MAKE) $(AM_MAKEFLAGS) rebuild' -fi - ## _KPSE_LIB_FLAGS: Setup libpaper (-lpaper) flags # Check whether --with-system-libpaper was given. diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac index 5593d291cb9..33a67c6c836 100644 --- a/Build/source/texk/dvipdfm-x/configure.ac +++ b/Build/source/texk/dvipdfm-x/configure.ac @@ -54,7 +54,6 @@ AC_SEARCH_LIBS([pow], [m]) KPSE_KPATHSEA_FLAGS KPSE_ZLIB_FLAGS KPSE_LIBPNG_FLAGS -KPSE_FREETYPE2_FLAGS KPSE_LIBPAPER_FLAGS AC_DEFINE([HAVE_LIBPAPER], [1], [Define if you have libpaper.]) -- cgit v1.2.3