summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-10 08:51:42 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-09-10 08:51:42 +0000
commit8d7910fb3f393070e8be38c87763915666719bf1 (patch)
tree16e989b5468a403244cdfb4f92c129568f7d1952 /Build/source/utils
parent51cd334488621c760ada07d554fe9fed81f86ef8 (diff)
Drop texk/ttf2pk and libs/freetype (Version 1.5)
git-svn-id: svn://tug.org/texlive/trunk@31618 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r--Build/source/utils/Makefile.in3
-rw-r--r--Build/source/utils/aclocal.m41
-rwxr-xr-xBuild/source/utils/configure63
3 files changed, 0 insertions, 67 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 07c2e9a72fd..218749da93e 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -94,7 +94,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../m4/kpse-cxx-hack.m4 \
- $(top_srcdir)/../m4/kpse-freetype-flags.m4 \
$(top_srcdir)/../m4/kpse-freetype2-flags.m4 \
$(top_srcdir)/../m4/kpse-gd-flags.m4 \
$(top_srcdir)/../m4/kpse-graphite2-flags.m4 \
@@ -166,7 +165,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../texk/ps2pkm/ac/withenable.ac \
$(top_srcdir)/../texk/seetexk/ac/withenable.ac \
$(top_srcdir)/../texk/tex4htk/ac/withenable.ac \
- $(top_srcdir)/../texk/ttf2pk/ac/withenable.ac \
$(top_srcdir)/../texk/ttf2pk2/ac/withenable.ac \
$(top_srcdir)/../texk/ttfdump/ac/withenable.ac \
$(top_srcdir)/../texk/xdvik/ac/withenable.ac \
@@ -184,7 +182,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
$(top_srcdir)/../libs/potrace/ac/withenable.ac \
$(top_srcdir)/../libs/gd/ac/withenable.ac \
$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
- $(top_srcdir)/../libs/freetype/ac/withenable.ac \
$(top_srcdir)/../libs/libpng/ac/withenable.ac \
$(top_srcdir)/../libs/lua52/ac/withenable.ac \
$(top_srcdir)/../libs/zlib/ac/withenable.ac \
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index 3351d983ef6..2977c206db3 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/aclocal.m4
@@ -1186,7 +1186,6 @@ AC_SUBST([am__untar])
m4_include([../m4/kpse-cairo-flags.m4])
m4_include([../m4/kpse-common.m4])
m4_include([../m4/kpse-cxx-hack.m4])
-m4_include([../m4/kpse-freetype-flags.m4])
m4_include([../m4/kpse-freetype2-flags.m4])
m4_include([../m4/kpse-gd-flags.m4])
m4_include([../m4/kpse-graphite2-flags.m4])
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 9e279fae535..42f5b3fa8ea 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -798,7 +798,6 @@ enable_mendexk
enable_ps2pkm
enable_seetexk
enable_tex4htk
-enable_ttf2pk
enable_ttf2pk2
enable_ttfdump
enable_xdvik
@@ -822,9 +821,6 @@ with_system_gd
with_gd_includes
with_gd_libdir
with_system_freetype2
-with_system_freetype
-with_freetype_includes
-with_freetype_libdir
with_system_libpng
with_system_zlib
with_zlib_includes
@@ -1594,7 +1590,6 @@ Optional Features:
--disable-ps2pkm do not build the ps2pkm package
--disable-seetexk do not build the seetexk package
--disable-tex4htk do not build the tex4htk package
- --enable-ttf2pk build the ttf2pk package
--disable-ttf2pk2 do not build the ttf2pk2 package
--disable-ttfdump do not build the ttfdump package
--disable-xdvik do not build the xdvik package
@@ -1672,11 +1667,6 @@ Optional Packages:
--with-gd-libdir=DIR gd library installed in DIR
--with-system-freetype2 use installed freetype2 headers and library
(requires freetype-config)
- --with-system-freetype use installed freetype headers and library
- --with-freetype-includes=DIR
- freetype headers installed in DIR
- --with-freetype-libdir=DIR
- freetype library installed in DIR
--with-system-libpng use installed libpng headers and library (requires
pkg-config)
--with-system-zlib use installed zlib headers and library
@@ -4647,29 +4637,6 @@ test "x$enable_tex4htk" = xno || {
need_kpathsea=yes
}
-## texk/ttf2pk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk/
-## configure options and TL libraries required for ttf2pk
-# Check whether --enable-ttf2pk was given.
-if test "${enable_ttf2pk+set}" = set; then :
- enableval=$enable_ttf2pk;
-fi
-case $enable_ttf2pk in #(
- yes|no) :
- ;; #(
- *) :
-
- enable_ttf2pk=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&5
-$as_echo "$as_me: Assuming \`--enable-ttf2pk=$enable_ttf2pk'" >&6;}
- ac_configure_args="$ac_configure_args '--enable-ttf2pk=$enable_ttf2pk'"
- ;;
-esac
-
-test "x$enable_ttf2pk" = xno || {
- need_kpathsea=yes
- need_freetype=yes
-}
-
## texk/ttf2pk2/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/ttf2pk2/
## configure options and TL libraries required for ttf2pk
# Check whether --enable-ttf2pk2 was given.
@@ -5161,36 +5128,6 @@ test "x$need_freetype2" = xyes && {
need_zlib=yes
}
-## libs/freetype/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/freetype/
-## configure options and TL libraries required for freetype
-
-# Check whether --with-system-freetype was given.
-if test "${with_system_freetype+set}" = set; then :
- withval=$with_system_freetype;
-fi
-
-# Check whether --with-freetype-includes was given.
-if test "${with_freetype_includes+set}" = set; then :
- withval=$with_freetype_includes;
-fi
-
-# Check whether --with-freetype-libdir was given.
-if test "${with_freetype_libdir+set}" = set; then :
- withval=$with_freetype_libdir;
-fi
-if test "x$with_system_freetype" = x; then
- if test -f $srcdir/../libs/freetype/configure; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`freetype' headers and library from TL tree" >&5
-$as_echo "$as_me: Assuming \`freetype' headers and library from TL tree" >&6;}
- with_system_freetype=no
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`freetype' headers and library" >&5
-$as_echo "$as_me: Assuming installed \`freetype' headers and library" >&6;}
- with_system_freetype=yes
- fi
- ac_configure_args="$ac_configure_args '--with-system-freetype=$with_system_freetype'"
-fi
-
## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
## configure options and TL libraries required for libpng